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

Merge pull request #3969 from consul/fix_legislation_tag_order

Browse Source 
Order legislation process tags alphabetically
This commit is contained in:
Javier Martín
2020-04-10 21:14:29 +02:00
committed by GitHub
parent c9a95c1818 4b043f2207
commit 426c1c5fd2
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/legislation/proposals/_form.html.erb
View File

@@ -3,7 +3,7 @@
<%= render "shared/errors", resource: @process %> <%= render "shared/errors", resource: @process %>
<div class="small-12 medium-8 column"> <div class="small-12 medium-8 column">
<%= f.text_field :custom_list, value: @process.tag_list_on(:customs).to_s, <%= f.text_field :custom_list, value: @process.tag_list_on(:customs).sort.join(", "),
label: t("admin.legislation.proposals.form.custom_categories"), label: t("admin.legislation.proposals.form.custom_categories"),
hint: t("admin.legislation.proposals.form.custom_categories_description"), hint: t("admin.legislation.proposals.form.custom_categories_description"),
placeholder: t("admin.legislation.proposals.form.custom_categories_placeholder"), placeholder: t("admin.legislation.proposals.form.custom_categories_placeholder"),

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

@@ -244,18 +244,20 @@ describe "Admin collaborative legislation" do
visit edit_admin_legislation_process_path(process) visit edit_admin_legislation_process_path(process)
within(".admin-content") { click_link "Proposals" } within(".admin-content") { click_link "Proposals" }
fill_in "Categories", with: "recycling,bicycles" fill_in "Categories", with: "recycling,bicycles,pollution"
click_button "Save changes" click_button "Save changes"
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, pollution, recycling")
within(".admin-content") { click_link "Information" } within(".admin-content") { click_link "Information" }
fill_in "Summary", with: "Summarizing the process" fill_in "Summary", with: "Summarizing the process"
click_button "Save changes" click_button "Save changes"
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, pollution, recycling")
end end
scenario "Edit milestones summary", :js do scenario "Edit milestones summary", :js do