consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace old show_phase? for new phase/publication started? for legislation processes

Browse Source
This commit is contained in:
Bertocq
2017-06-13 20:39:42 +02:00
parent 523988a291
commit 1b260c91f0
1 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/controllers/legislation/processes_controller.rb
View File

@@ -8,19 +8,17 @@ class Legislation::ProcessesController < Legislation::BaseController
end end
def show def show
if @process.active_phase?(:allegations) && @process.show_phase?(:allegations) && draft_version = @process.draft_versions.published.last if process.active_phase?(:allegations) && process.allegations_phase.started? && draft_version = process.draft_versions.published.last
redirect_to legislation_process_draft_version_path(@process, draft_version) redirect_to legislation_process_draft_version_path(process, draft_version)
elsif @process.active_phase?(:debate) elsif process.active_phase?(:debate)
redirect_to legislation_process_debate_path(@process) redirect_to legislation_process_debate_path(process)
else else
redirect_to legislation_process_allegations_path(@process) redirect_to legislation_process_allegations_path(process)
end end
end end
def debate def debate
phase :debate if process.debate_phase.started?
if @process.show_phase?(:debate)
render :debate render :debate
else else
render :phase_not_open render :phase_not_open
@@ -28,11 +26,9 @@ class Legislation::ProcessesController < Legislation::BaseController
end end
def draft_publication def draft_publication
phase :draft_publication if process.draft_publication.started?
if draft_version = process.draft_versions.published.last
if @process.show_phase?(@phase) redirect_to legislation_process_draft_version_path(process, draft_version)
if draft_version = @process.draft_versions.published.last
redirect_to legislation_process_draft_version_path(@process, draft_version)
else else
render :phase_empty render :phase_empty
end end
@@ -42,11 +38,9 @@ class Legislation::ProcessesController < Legislation::BaseController
end end
def allegations def allegations
phase :allegations if process.allegations_phase.started?
if draft_version = process.draft_versions.published.last
if @process.show_phase?(@phase) redirect_to legislation_process_draft_version_path(process, draft_version)
if draft_version = @process.draft_versions.published.last
redirect_to legislation_process_draft_version_path(@process, draft_version)
else else
render :phase_empty render :phase_empty
end end
@@ -56,11 +50,9 @@ class Legislation::ProcessesController < Legislation::BaseController
end end
def result_publication def result_publication
phase :result_publication if process.result_publication.started?
if final_version = process.final_draft_version
if @process.show_phase?(@phase) redirect_to legislation_process_draft_version_path(process, final_version)
if final_version = @process.final_draft_version
redirect_to legislation_process_draft_version_path(@process, final_version)
else else
render :phase_empty render :phase_empty
end end
@@ -71,8 +63,7 @@ class Legislation::ProcessesController < Legislation::BaseController
private private
def phase(phase) def process
@process = ::Legislation::Process.find(params[:process_id]) @process ||= ::Legislation::Process.find(params[:process_id])
@phase = phase
end end
end end