Merge pull request #3612 from consul/selected-proposals

Hide information on selected proposals

app/assets/stylesheets/participation.scss

@@ -444,6 +444,7 @@
   }
 
   blockquote {
+    clear: both;
     color: #4c4c4c;
     margin-top: rem-calc(12);
     padding-top: 0;

app/views/proposals/_info.html.erb

@@ -3,9 +3,12 @@
 
   <span class="bullet">&nbsp;&bull;&nbsp;</span>
   <%= l @proposal.created_at.to_date %>
-  <span class="bullet">&nbsp;&bull;&nbsp;</span>
-  <span class="icon-comments"></span>&nbsp;
-  <%= link_to t("proposals.show.comments", count: @proposal.comments_count), "#comments" %>
+
+  <% unless @proposal.selected? %>
+    <span class="bullet">&nbsp;&bull;&nbsp;</span>
+    <span class="icon-comments"></span>&nbsp;
+    <%= link_to t("proposals.show.comments", count: @proposal.comments_count), "#comments" %>
+  <% end %>
 
   <% if current_user %>
     <span class="bullet">&nbsp;&bull;&nbsp;</span>
@@ -19,10 +22,12 @@
 <%= render_image(@proposal.image, :large, true) if @proposal.image.present? %>
 
 <br>
-<p>
-  <%= t("proposals.show.code") %>
-  <strong><%= @proposal.code %></strong>
-</p>
+<% unless @proposal.selected? %>
+  <p>
+    <%= t("proposals.show.code") %>
+    <strong><%= @proposal.code %></strong>
+  </p>
+<% end %>
 
 <blockquote><%= @proposal.summary %></blockquote>
 

app/views/proposals/index.html.erb

@@ -71,11 +71,13 @@
         </div>
       <% end %>
 
-      <div class="row">
-        <div class="small-12 column">
-          <%= render "view_mode" %>
+      <% unless params[:selected].present? %>
+        <div class="row">
+          <div class="small-12 column">
+            <%= render "view_mode" %>
+          </div>
         </div>
-      </div>
+      <% end %>
 
       <% unless params[:retired].present? || params[:selected].present? %>
         <%= render "shared/advanced_search",

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 %>
 
         <div class="js-moderator-proposal-actions margin">
           <%= render "proposals/actions", proposal: @proposal %>

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