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

Merge pull request #3868 from andrewcameronsims/legislation_categories_persist

Browse Source 
Fix categories being removed when a legislation process is changed
This commit is contained in:
Javier Martín
2019-11-25 13:19:45 +01:00
committed by GitHub
parent c3d0e2b917 5d3748d863
commit 24359294e4
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/admin/legislation/processes_controller.rb
View File

@@ -24,8 +24,6 @@ class Admin::Legislation::ProcessesController < Admin::Legislation::BaseControll
def update def update
if @process.update(process_params) if @process.update(process_params)
set_tag_list
link = legislation_process_path(@process) link = legislation_process_path(@process)
redirect_back(fallback_location: (request.referer || root_path), redirect_back(fallback_location: (request.referer || root_path),
notice: t("admin.legislation.processes.update.notice", link: link)) notice: t("admin.legislation.processes.update.notice", link: link))
@@ -77,11 +75,6 @@ class Admin::Legislation::ProcessesController < Admin::Legislation::BaseControll
] ]
end end
def set_tag_list
@process.set_tag_list_on(:customs, process_params[:custom_list])
@process.save!
end
def resource def resource
@process || ::Legislation::Process.find(params[:id]) @process || ::Legislation::Process.find(params[:id])
end end

7
spec/features/admin/legislation/processes_spec.rb
View File

@@ -249,6 +249,13 @@ describe "Admin collaborative legislation" do
visit admin_legislation_process_proposals_path(process) visit admin_legislation_process_proposals_path(process)
expect(page).to have_field("Categories", with: "bicycles, recycling") expect(page).to have_field("Categories", with: "bicycles, recycling")
within(".admin-content") { click_link "Information" }
fill_in "Summary", with: "Summarizing the process"
click_button "Save changes"
visit admin_legislation_process_proposals_path(process)
expect(page).to have_field("Categories", with: "bicycles, recycling")
end end
scenario "Edit milestones summary", :js do scenario "Edit milestones summary", :js do