Redirect to allegations phase if open

This commit is contained in:
Amaia Castro
2017-02-09 15:18:31 +01:00
parent 5d060d6d8c
commit 5d37997a69
7 changed files with 41 additions and 23 deletions

View File

@@ -8,8 +8,18 @@ class Legislation::ProcessesController < Legislation::BaseController
end
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)
render :show
render :debate
else
render :phase_not_open
end

View File

@@ -16,7 +16,7 @@ module Abilities
can [:read], Budget::Group
can [:read, :print], Budget::Investment
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], Legislation::Question
can [:create], Legislation::Answer

View File

@@ -4,7 +4,7 @@
<%= render 'legislation/processes/key_dates_svg' %>
<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>
<p><%= format_date(process.debate_start_date) %> - <%= format_date(process.debate_end_date) %></p>
<% end %>

View 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>

View File

@@ -10,14 +10,9 @@
<div class="debate-draft">
<div class="small-12 medium-7 column">
<h3><%= t('.not_open') %></h3>
<p>Suscríbete al proceso para recibir un aviso en el momento en que se abra.</p>
</div>
<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>

View File

@@ -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>

View File

@@ -102,6 +102,7 @@ Rails.application.routes.draw do
namespace :legislation do
resources :processes, only: [:index, :show] do
get :debate
get :draft_publication
get :allegations
get :final_version_publication