@@ -29,6 +35,8 @@
<% elsif params[:retired].present? %>
<%= t("proposals.index.retired_proposals") %>
+ <% elsif params[:selected].present? %> +<%= t("proposals.index.selected_proposals") %>
<% end %>@@ -69,9 +77,14 @@
@@ -111,13 +124,21 @@
<%= link_to t("proposals.index.start_proposal"),
new_proposal_path,
class: "button expanded" %>
+
+
+
+
diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb
index e3b25a52d..f405f15af 100644
--- a/app/views/proposals/show.html.erb
+++ b/app/views/proposals/show.html.erb
@@ -62,44 +62,50 @@
<%= t("proposals.index.selected_proposals") %>
++
+ <%= link_to t("proposals.index.selected_proposals_link"), proposals_path(selected: "all") %> +
+ <% if params[:retired].blank? %> <%= render "categories" %> <%= render "shared/tag_cloud", taggable: "proposal" %> <%= render "geozones" %> - <%= render "popular" %> <% end %> <%= render "retired" %> + <%= render "proposals_lists" %>
-
-
-
-
<%= t("votes.supports") %>
+ <% if @proposal.selected? %> +
+ <%= t("proposals.proposal.selected") %>
+
+ <% else %>
+
+
-
+
+ <% end %>
<%= render "proposals/social_share", proposal: @proposal, share_title: t("proposals.show.share") %>
diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml
index 97c9431ca..142b8ecd4 100644
--- a/config/locales/en/activerecord.yml
+++ b/config/locales/en/activerecord.yml
@@ -187,6 +187,7 @@ en:
title: "Title"
question: "Question"
description: "Description"
+ selected: "Mark as selected"
terms_of_service: "Terms of service"
user:
login: "Email or username"
diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml
index 348d5a5e1..5653a0712 100644
--- a/config/locales/en/admin.yml
+++ b/config/locales/en/admin.yml
@@ -556,8 +556,6 @@ en:
id: Id
title: Title
supports: Total supports
- select: Select
- selected: Selected
form:
custom_categories: Categories
custom_categories_description: Categories that users can select creating the proposal. Max 160 characteres.
@@ -1239,10 +1237,16 @@ en:
title: Proposals
id: ID
author: Author
+ select: Select
+ selected: Selected
milestones: Milestones
no_proposals: There are no proposals.
show:
create_question: Add this proposal to a poll to be voted
+ form:
+ update: Update proposal
+ update:
+ notice: Proposal updated successfully
hidden_proposals:
index:
filter: Filter
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml
index 820319ae6..e28656c35 100644
--- a/config/locales/en/general.yml
+++ b/config/locales/en/general.yml
@@ -376,6 +376,10 @@ en:
error: "An error has occured. Please go to 'My account' page to manually disable recommendations for proposals"
retired_proposals: Retired proposals
retired_proposals_link: "Proposals retired by the author"
+ selected_proposals: Selected proposals
+ selected_proposals_link: View selected proposals
+ archived_proposals: Archived proposals
+ proposals_lists: Proposals lists
retired_links:
all: All
duplicated: Duplicated
@@ -437,9 +441,11 @@ en:
other: "%{count} votes"
zero: No votes
supports_necessary: "%{number} supports needed"
+ reason_for_supports_necessary: ""
total_percent: 100%
archived: "This proposal has been archived and can't collect supports."
successful: "This proposal has reached the required supports."
+ selected: "Selected proposal"
show:
author_deleted: User deleted
code: "Proposal code:"
diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml
index 32611918a..ceec2cff8 100644
--- a/config/locales/es/activerecord.yml
+++ b/config/locales/es/activerecord.yml
@@ -187,6 +187,7 @@ es:
title: "Título"
question: "Pregunta"
description: "Descripción"
+ selected: "Marcar como seleccionada"
terms_of_service: "Términos de servicio"
user:
login: "Email o nombre de usuario"
diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml
index db3a1dec8..05183ebc6 100644
--- a/config/locales/es/admin.yml
+++ b/config/locales/es/admin.yml
@@ -555,8 +555,6 @@ es:
back: Volver
id: Id
supports: Apoyos totales
- select: Seleccionar
- selected: Seleccionada
form:
custom_categories: Categorías
custom_categories_description: Categorías que el usuario puede seleccionar al crear la propuesta. Máximo 160 caracteres.
@@ -1239,9 +1237,15 @@ es:
id: ID
author: Autor
milestones: Hitos
+ select: Seleccionar
+ selected: Seleccionada
no_proposals: No hay propuestas.
show:
create_question: Añadir esta propuesta a una votación para ser votada
+ form:
+ update: Actualizar propuesta ciudadana
+ update:
+ notice: Propuesta actualizada correctamente
hidden_proposals:
index:
filter: Filtro
diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml
index 38a688f88..153a50b13 100644
--- a/config/locales/es/general.yml
+++ b/config/locales/es/general.yml
@@ -376,6 +376,10 @@ es:
error: "Ha ocurrido un error. Por favor dirígete al apartado 'Mi cuenta' para desactivar las recomendaciones manualmente"
retired_proposals: Propuestas retiradas
retired_proposals_link: "Propuestas retiradas por sus autores"
+ selected_proposals: Propuestas seleccionadas
+ selected_proposals_link: Ver propuestas seleccionadas
+ archived_proposals: Propuestas archivadas
+ proposals_lists: Listas de propuestas
retired_links:
all: Todas
duplicated: Duplicadas
@@ -437,9 +441,11 @@ es:
one: 1 voto
other: "%{count} votos"
supports_necessary: "%{number} apoyos necesarios"
+ reason_for_supports_necessary: ""
total_percent: 100%
archived: "Esta propuesta ha sido archivada y ya no puede recoger apoyos."
successful: "Esta propuesta ha alcanzado los apoyos necesarios."
+ selected: "Propuesta seleccionada"
show:
author_deleted: Usuario eliminado
code: "Código de la propuesta:"
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index 917f1447c..1e67bcc5e 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -29,7 +29,8 @@ namespace :admin do
end
end
- resources :proposals, only: [:index, :show] do
+ resources :proposals, only: [:index, :show, :update] do
+ member { patch :toggle_selection }
resources :milestones, controller: "proposal_milestones"
resources :progress_bars, except: :show, controller: "proposal_progress_bars"
end
diff --git a/db/migrate/20190410132842_add_selected_to_proposal.rb b/db/migrate/20190410132842_add_selected_to_proposal.rb
new file mode 100644
index 000000000..a97d6619c
--- /dev/null
+++ b/db/migrate/20190410132842_add_selected_to_proposal.rb
@@ -0,0 +1,5 @@
+class AddSelectedToProposal < ActiveRecord::Migration
+ def change
+ add_column :proposals, :selected, :bool, default: false, index: true
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 1eedef558..1ce1fe02c 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -1194,6 +1194,7 @@ ActiveRecord::Schema.define(version: 20190429125842) do
t.text "retired_explanation"
t.integer "community_id"
t.datetime "published_at"
+ t.boolean "selected", default: false
t.index ["author_id", "hidden_at"], name: "index_proposals_on_author_id_and_hidden_at", using: :btree
t.index ["author_id"], name: "index_proposals_on_author_id", using: :btree
t.index ["cached_votes_up"], name: "index_proposals_on_cached_votes_up", using: :btree
diff --git a/spec/factories/proposals.rb b/spec/factories/proposals.rb
index 0821eb168..7cbd44acb 100644
--- a/spec/factories/proposals.rb
+++ b/spec/factories/proposals.rb
@@ -33,6 +33,10 @@ FactoryBot.define do
created_at { 25.months.ago }
end
+ trait :selected do
+ selected true
+ end
+
trait :with_hot_score do
before(:save) { |d| d.calculate_hot_score }
end
diff --git a/spec/features/admin/proposals_spec.rb b/spec/features/admin/proposals_spec.rb
index 0048108ad..7377ca7d2 100644
--- a/spec/features/admin/proposals_spec.rb
+++ b/spec/features/admin/proposals_spec.rb
@@ -10,6 +10,7 @@ describe "Admin proposals" do
"admin_proposal_path"
context "Index" do
+
scenario "Search" do
create(:proposal, title: "Make Pluto a planet again")
create(:proposal, title: "Build a monument to honour CONSUL developers")
@@ -26,6 +27,29 @@ describe "Admin proposals" do
expect(page).to have_content "Make Pluto a planet again"
expect(page).not_to have_content "Build a monument"
end
+
+ scenario "Select a proposal", :js do
+ proposal = create(:proposal)
+
+ visit admin_proposals_path
+
+ within("#proposal_#{proposal.id}") { click_link "Select" }
+
+ within("#proposal_#{proposal.id}") { expect(page).to have_link "Selected" }
+ expect(proposal.reload.selected?).to be true
+ end
+
+ scenario "Unselect a proposal", :js do
+ proposal = create(:proposal, :selected)
+
+ visit admin_proposals_path
+
+ within("#proposal_#{proposal.id}") { click_link "Selected" }
+
+ within("#proposal_#{proposal.id}") { expect(page).to have_link "Select" }
+ expect(proposal.reload.selected?).to be false
+ end
+
end
context "Show" do
@@ -55,5 +79,32 @@ describe "Admin proposals" do
expect(page).to have_link "Add this proposal to a poll to be voted"
end
end
+
+ scenario "Select a proposal" do
+ proposal = create(:proposal)
+
+ visit admin_proposal_path(proposal)
+
+ check "Mark as selected"
+ click_button "Update proposal"
+
+ expect(page).to have_content "Proposal updated successfully"
+ expect(find_field("Mark as selected")).to be_checked
+ expect(proposal.reload.selected?).to be true
+ end
+
+ scenario "Unselect a proposal" do
+ proposal = create(:proposal, :selected)
+
+ visit admin_proposal_path(proposal)
+
+ uncheck "Mark as selected"
+ click_button "Update proposal"
+
+ expect(page).to have_content "Proposal updated successfully"
+ expect(find_field("Mark as selected")).not_to be_checked
+ expect(proposal.reload.selected?).to be false
+ end
+
end
end
diff --git a/spec/features/proposal_ballots_spec.rb b/spec/features/proposal_ballots_spec.rb
index 62de85e7b..d88a05985 100644
--- a/spec/features/proposal_ballots_spec.rb
+++ b/spec/features/proposal_ballots_spec.rb
@@ -9,8 +9,8 @@ describe "Proposal ballots" do
visit proposals_path
successful_proposals.each do |proposal|
- within("#proposal_#{proposal.id}_votes") do
- expect(page).to have_content "This proposal has reached the required supports"
+ within("#proposal_#{proposal.id}_votes .supports .progress") do
+ expect(page).to have_content "100% / 100%"
end
end
end
@@ -20,8 +20,8 @@ describe "Proposal ballots" do
successful_proposals.each do |proposal|
visit proposal_path(proposal)
- within("#proposal_#{proposal.id}_votes") do
- expect(page).to have_content "This proposal has reached the required supports"
+ within("#proposal_#{proposal.id}_votes .supports .progress") do
+ expect(page).to have_content "100% / 100%"
end
end
end
diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb
index db3850dd7..ea79c8768 100644
--- a/spec/features/proposals_spec.rb
+++ b/spec/features/proposals_spec.rb
@@ -833,12 +833,12 @@ describe "Proposals" do
describe "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|
@@ -906,7 +906,7 @@ describe "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)
@@ -924,7 +924,7 @@ describe "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"
@@ -935,6 +935,96 @@ describe "Proposals" do
end
+ context "Selected Proposals" do
+ let!(:selected_proposal) { create(:proposal, :selected) }
+ let!(:not_selected_proposal) { create(:proposal) }
+
+ scenario "do not show in index by default" do
+ visit proposals_path
+
+ expect(page).to have_selector("#proposals .proposal", count: 1)
+ expect(page).to have_content not_selected_proposal.title
+ expect(page).not_to have_content selected_proposal.title
+ end
+
+ scenario "show in selected proposals list" do
+ visit proposals_path
+ click_link "View selected proposals"
+
+ expect(page).to have_selector("#proposals .proposal", count: 1)
+ expect(page).to have_content selected_proposal.title
+ expect(page).not_to have_content not_selected_proposal.title
+ end
+
+ scenario "show a selected proposal message in show view" do
+ visit proposal_path(selected_proposal)
+
+ within("aside") { expect(page).not_to have_content "SUPPORTS" }
+ within("aside") { expect(page).to have_content "Selected proposal" }
+ end
+
+ scenario "do not show featured proposal in selected proposals list" do
+ Setting["feature.featured_proposals"] = true
+ create_featured_proposals
+
+ visit proposals_path
+
+ expect(page).to have_selector("#proposals .proposal-featured")
+ expect(page).to have_selector("#featured-proposals")
+
+ click_link "View selected proposals"
+
+ expect(page).not_to have_selector("#proposals .proposal-featured")
+ expect(page).not_to have_selector("#featured-proposals")
+ end
+
+ scenario "do not show recommented proposal in selected proposals list" do
+ create(:proposal, title: "Recommended", cached_votes_up: 10, tag_list: "Economy")
+
+ user = create(:user)
+ create(:follow, followable: create(:proposal, tag_list: "Economy"), user: user)
+
+ login_as(user)
+ visit proposals_path
+
+ expect(page).to have_css(".recommendation", count: 1)
+ expect(page).to have_link "Recommended"
+ expect(page).to have_link "See more recommendations"
+
+ click_link "View selected proposals"
+
+ expect(page).not_to have_css ".recommendation"
+ expect(page).not_to have_link "Recommended"
+ expect(page).not_to have_link "See more recommendations"
+ end
+
+ scenario "do not show order links in selected proposals list" do
+ visit proposals_path
+
+ expect(page).to have_css "ul.submenu"
+ expect(page).to have_link "most active"
+ expect(page).to have_link "highest rated"
+ expect(page).to have_link "newest"
+
+ click_link "View selected proposals"
+
+ expect(page).not_to have_css "ul.submenu"
+ expect(page).not_to have_link "most active"
+ expect(page).not_to have_link "highest rated"
+ expect(page).not_to have_link "newest"
+ end
+
+ scenario "show archived proposals in selected proposals list" do
+ archived_proposal = create(:proposal, :selected, :archived)
+
+ visit proposals_path
+ expect(page).not_to have_content archived_proposal.title
+
+ click_link "View selected proposals"
+ expect(page).to have_content archived_proposal.title
+ end
+ end
+
context "Search" do
context "Basic search" do
@@ -1754,8 +1844,8 @@ describe "Successful proposals" do
successful_proposals.each do |proposal|
within("#proposal_#{proposal.id}_votes") do
- expect(page).not_to have_css(".supports")
- expect(page).to have_content "This proposal has reached the required supports"
+ expect(page).not_to have_link "Support"
+ expect(page).to have_content "100% / 100%"
end
end
end
@@ -1766,8 +1856,8 @@ describe "Successful proposals" do
successful_proposals.each do |proposal|
visit proposal_path(proposal)
within("#proposal_#{proposal.id}_votes") do
- expect(page).not_to have_css(".supports")
- expect(page).to have_content "This proposal has reached the required supports"
+ expect(page).not_to have_link "Support"
+ expect(page).to have_content "100% / 100%"
end
end
end
diff --git a/spec/models/proposal_spec.rb b/spec/models/proposal_spec.rb
index e9d316350..b55cbba9f 100644
--- a/spec/models/proposal_spec.rb
+++ b/spec/models/proposal_spec.rb
@@ -866,6 +866,30 @@ describe Proposal do
end
end
+ describe "selected" do
+ let!(:not_selected_proposal) { create(:proposal) }
+ let!(:selected_proposal) { create(:proposal, :selected) }
+
+ it "selected? is true" do
+ expect(not_selected_proposal.selected?).to be false
+ expect(selected_proposal.selected?).to be true
+ end
+
+ it "scope selected" do
+ selected = Proposal.selected
+
+ expect(selected.size).to be 1
+ expect(selected.first).to eq selected_proposal
+ end
+
+ it "scope not_selected" do
+ not_selected = Proposal.not_selected
+
+ expect(not_selected.size).to be 1
+ expect(not_selected.first).to eq not_selected_proposal
+ end
+ end
+
describe "public_for_api scope" do
it "returns proposals" do
proposal = create(:proposal)
+
-
+
+
<%= t("votes.supports") %>
-
- <% if @proposal.draft? %>
-
-
- <% elsif @proposal.successful? %>
- <%= t('.draft') %>
-- <%= t("proposals.proposal.successful") %> -
- <% elsif @proposal.archived? %> -
-
- <% else %>
- <%= render "votes",
- { proposal: @proposal, vote_url: vote_proposal_path(@proposal, value: "yes") } %>
- <% end %>
+ - <%= t("proposals.proposal.supports", count: @proposal.total_votes) %> -
-<%= t("proposals.proposal.archived") %>
-
+ <% if @proposal.draft? %>
+
+
+ <% elsif @proposal.successful? %>
+ <%= t(".draft") %>
+
+ <%= render "supports", proposal: @proposal %>
+
+ <% elsif @proposal.archived? %>
+
+
+ <% else %>
+ <%= render "votes",
+ { proposal: @proposal, vote_url: vote_proposal_path(@proposal, value: "yes") } %>
+ <% end %>
+ + <%= t("proposals.proposal.supports", count: @proposal.total_votes) %> +
+<%= t("proposals.proposal.archived") %>
+