diff --git a/app/controllers/legislation/processes_controller.rb b/app/controllers/legislation/processes_controller.rb index 1b51cec07..ad33000b0 100644 --- a/app/controllers/legislation/processes_controller.rb +++ b/app/controllers/legislation/processes_controller.rb @@ -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 diff --git a/app/models/abilities/everyone.rb b/app/models/abilities/everyone.rb index 4d44f14eb..c86305862 100644 --- a/app/models/abilities/everyone.rb +++ b/app/models/abilities/everyone.rb @@ -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 diff --git a/app/views/legislation/processes/_key_dates.html.erb b/app/views/legislation/processes/_key_dates.html.erb index e64d99f08..7e53f7097 100644 --- a/app/views/legislation/processes/_key_dates.html.erb +++ b/app/views/legislation/processes/_key_dates.html.erb @@ -1,10 +1,10 @@ -