diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss
index a31978cee..c578b63ac 100644
--- a/app/assets/stylesheets/participation.scss
+++ b/app/assets/stylesheets/participation.scss
@@ -444,6 +444,7 @@
}
blockquote {
+ clear: both;
color: #4c4c4c;
margin-top: rem-calc(12);
padding-top: 0;
diff --git a/app/views/proposals/_info.html.erb b/app/views/proposals/_info.html.erb
index da1eb3435..35607e6ec 100644
--- a/app/views/proposals/_info.html.erb
+++ b/app/views/proposals/_info.html.erb
@@ -3,9 +3,12 @@
•
<%= l @proposal.created_at.to_date %>
- •
-
- <%= link_to t("proposals.show.comments", count: @proposal.comments_count), "#comments" %>
+
+ <% unless @proposal.selected? %>
+ •
+
+ <%= link_to t("proposals.show.comments", count: @proposal.comments_count), "#comments" %>
+ <% end %>
<% if current_user %>
•
@@ -19,10 +22,12 @@
<%= render_image(@proposal.image, :large, true) if @proposal.image.present? %>
-
- <%= t("proposals.show.code") %>
- <%= @proposal.code %>
-
+<% unless @proposal.selected? %>
+
+ <%= t("proposals.show.code") %>
+ <%= @proposal.code %>
+
+<% end %>
<%= @proposal.summary %>
diff --git a/app/views/proposals/index.html.erb b/app/views/proposals/index.html.erb
index 4515fa2e5..a83da2fc5 100644
--- a/app/views/proposals/index.html.erb
+++ b/app/views/proposals/index.html.erb
@@ -71,11 +71,13 @@
<% end %>
-
-
- <%= render "view_mode" %>
+ <% unless params[:selected].present? %>
+
+
+ <%= render "view_mode" %>
+
-
+ <% end %>
<% unless params[:retired].present? || params[:selected].present? %>
<%= render "shared/advanced_search",
diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb
index 93f59236a..ccd0e1a90 100644
--- a/app/views/proposals/show.html.erb
+++ b/app/views/proposals/show.html.erb
@@ -40,7 +40,10 @@
<%= render "proposals/info", proposal: @proposal %>
<%= render "shared/geozone", geozonable: @proposal %>
- <%= render "relationable/related_content", relationable: @proposal %>
+
+ <% unless @proposal.selected? %>
+ <%= render "relationable/related_content", relationable: @proposal %>
+ <% end %>
<%= render "proposals/actions", proposal: @proposal %>
diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb
index 42b764a31..54295dc8e 100644
--- a/spec/features/proposals_spec.rb
+++ b/spec/features/proposals_spec.rb
@@ -100,6 +100,15 @@ describe "Proposals" do
end
end
+ scenario "Index view mode is not shown with selected filter" do
+ visit proposals_path
+
+ click_link "View selected proposals"
+
+ expect(page).not_to have_selector(".view-mode")
+ expect(page).not_to have_button("View mode")
+ end
+
scenario "Pagination" do
per_page = Kaminari.config.default_per_page
(per_page + 5).times { create(:proposal) }
@@ -194,6 +203,22 @@ describe "Proposals" do
visit proposal_path(proposal)
expect(page).not_to have_content "Access the community"
end
+
+ scenario "Selected proposals does not show all information" do
+ proposal = create(:proposal, :selected)
+ login_as(create(:user))
+
+ visit proposal_path(proposal)
+ expect(page).not_to have_content proposal.code
+ expect(page).not_to have_content("Proposal code:")
+
+ expect(page).not_to have_content("Related content")
+ expect(page).not_to have_button("Add related content")
+
+ within(".proposal-info") do
+ expect(page).not_to have_link("No comments", href: "#comments")
+ end
+ end
end
context "Show on mobile screens" do