diff --git a/app/controllers/proposals_controller.rb b/app/controllers/proposals_controller.rb index 52c16f0e0..5a19f7907 100644 --- a/app/controllers/proposals_controller.rb +++ b/app/controllers/proposals_controller.rb @@ -53,6 +53,7 @@ class ProposalsController < ApplicationController load_retired load_selected load_featured + remove_archived_from_order_links end def vote @@ -156,6 +157,10 @@ class ProposalsController < ApplicationController end end + def remove_archived_from_order_links + @valid_orders.delete("archival_date") + end + def set_view @view = (params[:view] == "minimal") ? "minimal" : "default" end diff --git a/app/views/proposals/_popular.html.erb b/app/views/proposals/_popular.html.erb deleted file mode 100644 index 7f46ea802..000000000 --- a/app/views/proposals/_popular.html.erb +++ /dev/null @@ -1,6 +0,0 @@ - - - -

- <%= link_to t("proposals.index.top_link_proposals"), summary_proposals_path, class: "small" %>
-

diff --git a/app/views/proposals/_proposals_lists.html.erb b/app/views/proposals/_proposals_lists.html.erb new file mode 100644 index 000000000..43154aeab --- /dev/null +++ b/app/views/proposals/_proposals_lists.html.erb @@ -0,0 +1,20 @@ + + + +

+ <%= link_to t("proposals.index.top_link_proposals"), + summary_proposals_path, + class: "small" %> +
+ <%= link_to t("proposals.index.archived_proposals"), + proposals_path(order: "archival_date"), + class: "small" %> +
+ <%= link_to t("proposals.index.retired_proposals_link"), + proposals_path(retired: "all"), + class: "small" %> +
+ <%= link_to t("proposals.index.selected_proposals"), + proposals_path(selected: "all"), + class: "small" %> +

diff --git a/app/views/proposals/_retired.html.erb b/app/views/proposals/_retired.html.erb index 78d5c2af0..21b588b0c 100644 --- a/app/views/proposals/_retired.html.erb +++ b/app/views/proposals/_retired.html.erb @@ -1,9 +1,7 @@ - - +<% if params[:retired].present? %> + + -<% if params[:retired].blank? %> -

<%= link_to t("proposals.index.retired_proposals_link"), proposals_path(retired: "all"), class: "small" %>

-<% else %> diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml index 021d120f1..09a064b65 100644 --- a/config/locales/en/general.yml +++ b/config/locales/en/general.yml @@ -377,6 +377,8 @@ en: retired_proposals: Retired proposals retired_proposals_link: "Proposals retired by the author" selected_proposals: Selected proposals + archived_proposals: Archived proposals + proposals_lists: Proposals lists retired_links: all: All duplicated: Duplicated diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml index 76f88587a..e8c555ab7 100644 --- a/config/locales/es/general.yml +++ b/config/locales/es/general.yml @@ -377,6 +377,8 @@ es: retired_proposals: Propuestas retiradas retired_proposals_link: "Propuestas retiradas por sus autores" selected_proposals: Propuestas seleccionadas + archived_proposals: Propuestas archivadas + proposals_lists: Listas de propuestas retired_links: all: Todas duplicated: Duplicadas diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb index 74669a661..2e58a60c2 100644 --- a/spec/features/proposals_spec.rb +++ b/spec/features/proposals_spec.rb @@ -852,12 +852,12 @@ feature "Proposals" do feature "Archived proposals" do - scenario "show on archived tab" do + scenario "show on proposals list" do create_featured_proposals archived_proposals = create_archived_proposals visit proposals_path - click_link "archived" + click_link "Archived proposals" within("#proposals-list") do archived_proposals.each do |proposal| @@ -925,7 +925,7 @@ feature "Proposals" do expect(page).not_to have_content(archived_proposal.title) end - click_link "archived" + click_link "Archived proposals" within("#featured-proposals") do expect(page).to have_content(featured_proposal.title) @@ -943,7 +943,7 @@ feature "Proposals" do create(:proposal, :archived, title: "Some votes").update_column(:confidence_score, 25) visit proposals_path - click_link "archived" + click_link "Archived proposals" within("#proposals-list") do expect(all(".proposal")[0].text).to match "Most voted"