diff --git a/app/views/management/proposals/print.html.erb b/app/views/management/proposals/print.html.erb index 80f97dca0..6dc20b639 100644 --- a/app/views/management/proposals/print.html.erb +++ b/app/views/management/proposals/print.html.erb @@ -14,7 +14,9 @@ <%= t("proposals.index.select_order_long") %> <%= t("management.print.proposals_title") %> - <%= render "shared/order_selector", i18n_namespace: "proposals.index" %> +
+ <%= render "shared/order_links", i18n_namespace: "proposals.index" %> +
<%= render @proposals %> diff --git a/app/views/shared/_order_selector.html.erb b/app/views/shared/_order_selector.html.erb deleted file mode 100644 index 594bf145d..000000000 --- a/app/views/shared/_order_selector.html.erb +++ /dev/null @@ -1,16 +0,0 @@ -<% if @valid_orders.present? && @valid_orders.count > 1 %> -
- - -
-<% end %> diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index 28c779b6f..870c5a0a2 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -190,7 +190,6 @@ ignore_unused: - "debates.index.select_order" - "debates.index.orders.*" - "debates.index.section_header.*" - - "proposals.index.select_order" - "proposals.index.orders.*" - "proposals.index.section_header.*" - "*.index.search_form.*" diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 5c45f5300..bcfad4e30 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -378,7 +378,6 @@ en: search_results: one: " containing the term '%{search_term}'" other: " containing the term '%{search_term}'" - select_order: Order by select_order_long: "You are viewing proposals according to:" start_proposal: Create a proposal title: Proposals diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index dec72880e..75cc34870 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -378,7 +378,6 @@ es: search_results: one: " que contiene '%{search_term}'" other: " que contienen '%{search_term}'" - select_order: Ordenar por select_order_long: "Estas viendo las propuestas" start_proposal: Crea una propuesta title: Propuestas ciudadanas diff --git a/spec/system/management/proposals_spec.rb b/spec/system/management/proposals_spec.rb index f67a40f12..6dc2f180f 100644 --- a/spec/system/management/proposals_spec.rb +++ b/spec/system/management/proposals_spec.rb @@ -214,16 +214,16 @@ describe "Proposals" do login_as_manager click_link "Print proposals" - expect(page).to have_selector(".js-order-selector[data-order='confidence_score']") + expect(page).to have_link "highest rated", class: "is-active" within(".proposals-list") do expect(best_proposal.title).to appear_before(medium_proposal.title) expect(medium_proposal.title).to appear_before(worst_proposal.title) end - select "newest", from: "order-selector" + click_link "newest" - expect(page).to have_selector(".js-order-selector[data-order='created_at']") + expect(page).to have_link "newest", class: "is-active" expect(page).to have_current_path(/order=created_at/) expect(page).to have_current_path(/page=1/)