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

Fix draft versions list

Browse Source
This commit is contained in:
Amaia Castro
2017-01-04 10:13:55 +01:00
parent f040759693
commit 6d99a24740
7 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/controllers/legislation/draft_versions_controller.rb
View File

@@ -6,15 +6,17 @@ class Legislation::DraftVersionsController < Legislation::BaseController
end
def show
load_version(params[:id])
@draft_versions_list = visible_draft_versions
@draft_version = @draft_versions_list.find(params[:id])
end
def changes
load_version(params[:draft_version_id])
@draft_versions_list = visible_draft_versions
@draft_version = @draft_versions_list.find(params[:draft_version_id])
end
def go_to_version
version = @process.draft_versions.published.find(params[:draft_version_id])
version = visible_draft_versions.find(params[:draft_version_id])
if params[:redirect_action] == 'changes'
redirect_to legislation_process_draft_version_changes_path(@process, version)
@@ -25,11 +27,12 @@ class Legislation::DraftVersionsController < Legislation::BaseController
private
def load_version(id_param)
def visible_draft_versions
if current_user && current_user.administrator?
@draft_version = @process.draft_versions.find(id_param)
@process.draft_versions
else
@draft_version = @process.draft_versions.published.find(id_param)
@process.draft_versions.published
end
end
end