Redirect to allegations phase if open
This commit is contained in:
@@ -8,8 +8,18 @@ class Legislation::ProcessesController < Legislation::BaseController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def show
|
def show
|
||||||
|
if @process.show_phase?(:allegations) && draft_version = @process.draft_versions.published.last
|
||||||
|
redirect_to legislation_process_draft_version_path(@process, draft_version)
|
||||||
|
else
|
||||||
|
redirect_to legislation_process_debate_path(@process)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def debate
|
||||||
|
phase :debate
|
||||||
|
|
||||||
if @process.show_phase?(:debate)
|
if @process.show_phase?(:debate)
|
||||||
render :show
|
render :debate
|
||||||
else
|
else
|
||||||
render :phase_not_open
|
render :phase_not_open
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ module Abilities
|
|||||||
can [:read], Budget::Group
|
can [:read], Budget::Group
|
||||||
can [:read, :print], Budget::Investment
|
can [:read, :print], Budget::Investment
|
||||||
can :new, DirectMessage
|
can :new, DirectMessage
|
||||||
can [:read, :draft_publication, :allegations, :final_version_publication], Legislation::Process
|
can [:read, :debate, :draft_publication, :allegations, :final_version_publication], Legislation::Process
|
||||||
can [:read, :changes, :go_to_version], Legislation::DraftVersion
|
can [:read, :changes, :go_to_version], Legislation::DraftVersion
|
||||||
can [:read], Legislation::Question
|
can [:read], Legislation::Question
|
||||||
can [:create], Legislation::Answer
|
can [:create], Legislation::Answer
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
<nav class="legislation-process-categories">
|
<nav class="legislation-process-categories">
|
||||||
<div class="legislation-process-list">
|
<div class="legislation-process-list">
|
||||||
<ul>
|
<ul>
|
||||||
<%= render 'legislation/processes/key_dates_svg' %>
|
<%= render 'legislation/processes/key_dates_svg' %>
|
||||||
|
|
||||||
<li <%= "class=active" if phase == :debate %>>
|
<li <%= "class=active" if phase == :debate %>>
|
||||||
<%= link_to process do %>
|
<%= link_to legislation_process_debate_path(process) do %>
|
||||||
<h4><%= t('legislation.processes.shared.debate_dates') %></h4>
|
<h4><%= t('legislation.processes.shared.debate_dates') %></h4>
|
||||||
<p><%= format_date(process.debate_start_date) %> - <%= format_date(process.debate_end_date) %></p>
|
<p><%= format_date(process.debate_start_date) %> - <%= format_date(process.debate_end_date) %></p>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
25
app/views/legislation/processes/debate.html.erb
Normal file
25
app/views/legislation/processes/debate.html.erb
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
<% provide :title do %><%= @process.title %><% end %>
|
||||||
|
|
||||||
|
<%= render 'legislation/processes/header', process: @process, header: :full %>
|
||||||
|
|
||||||
|
<%= render 'key_dates', process: @process, phase: :debate %>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<div class="debate-chooser">
|
||||||
|
<div class="row">
|
||||||
|
<div class="small-12 medium-9 column">
|
||||||
|
<div class="debate-list">
|
||||||
|
<% if @process.questions.empty? %>
|
||||||
|
<p><%= t('.empty_questions') %></p>
|
||||||
|
<% else %>
|
||||||
|
<%= render @process.questions %>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="small-12 medium-3 column">
|
||||||
|
<div class="debate-info"><%= t('.participate') %></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@@ -10,14 +10,9 @@
|
|||||||
<div class="debate-draft">
|
<div class="debate-draft">
|
||||||
<div class="small-12 medium-7 column">
|
<div class="small-12 medium-7 column">
|
||||||
<h3><%= t('.not_open') %></h3>
|
<h3><%= t('.not_open') %></h3>
|
||||||
<p>Suscríbete al proceso para recibir un aviso en el momento en que se abra.</p>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="small-12 medium-5 column">
|
<div class="small-12 medium-5 column">
|
||||||
<button class="button-subscribe expanded button strong" title="Suscríbete al proceso" data-remote="true" rel="nofollow" data-method="post" href="/proposals/6-soluta-sed-sapiente-dolores/vote?value=yes">
|
|
||||||
<h3>Suscríbete al proceso</h3>
|
|
||||||
<p>Recibe notificaciones clave sobre el proceso</p>
|
|
||||||
</button>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,13 +0,0 @@
|
|||||||
<% provide :title do %><%= @process.title %><% end %>
|
|
||||||
|
|
||||||
<%= render 'legislation/processes/header', process: @process, header: :full %>
|
|
||||||
|
|
||||||
<%= render 'key_dates', process: @process, phase: :debate %>
|
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="debate-chooser">
|
|
||||||
<div class="row">
|
|
||||||
<%= render 'debate', process: @process %>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
@@ -102,6 +102,7 @@ Rails.application.routes.draw do
|
|||||||
|
|
||||||
namespace :legislation do
|
namespace :legislation do
|
||||||
resources :processes, only: [:index, :show] do
|
resources :processes, only: [:index, :show] do
|
||||||
|
get :debate
|
||||||
get :draft_publication
|
get :draft_publication
|
||||||
get :allegations
|
get :allegations
|
||||||
get :final_version_publication
|
get :final_version_publication
|
||||||
|
|||||||
Reference in New Issue
Block a user