From 62088bc635b9000fde04f8e1e0b02587ee9f540f Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Wed, 23 Jan 2019 17:43:05 +0100
Subject: [PATCH 1/2] Hide poll results and stats to admins

---
 app/views/polls/_poll_subnav.html.erb |  6 ++----
 spec/features/polls/polls_spec.rb     | 25 ++++++++++++++++---------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/app/views/polls/_poll_subnav.html.erb b/app/views/polls/_poll_subnav.html.erb
index 94d522dab..ff1e7434e 100644
--- a/app/views/polls/_poll_subnav.html.erb
+++ b/app/views/polls/_poll_subnav.html.erb
@@ -1,10 +1,8 @@
-<% if current_user && current_user.administrator? ||
-  (@poll.expired? && (@poll.results_enabled? || @poll.stats_enabled?)) %>
   <div class="row margin-top">
     <div class="small-12 column">
       <ul class="menu simple clear">
-        <% if current_user && current_user.administrator? || @poll.results_enabled? %>
           <% if controller_name == "polls" && action_name == "results" %>
+        <% if @poll.results_enabled? %>
             <li class="is-active">
               <h2><%= t("polls.show.results_menu") %></h2>
             </li>
@@ -13,8 +11,8 @@
           <% end %>
         <% end %>
 
-        <% if current_user && current_user.administrator? || @poll.stats_enabled? %>
           <% if controller_name == "polls" && action_name == "stats" %>
+        <% if @poll.stats_enabled? %>
             <li class="is-active">
               <h2><%= t("polls.show.stats_menu") %></h2>
             </li>
diff --git a/spec/features/polls/polls_spec.rb b/spec/features/polls/polls_spec.rb
index a75afb8a5..73d8b9658 100644
--- a/spec/features/polls/polls_spec.rb
+++ b/spec/features/polls/polls_spec.rb
@@ -474,21 +474,28 @@ feature 'Polls' do
       expect(page).to have_content("You do not have permission to carry out the action 'stats' on poll.")
     end
 
-    scenario "Show poll results and stats if user is administrator" do
-      poll = create(:poll, :current, results_enabled: false, stats_enabled: false)
-      user = create(:administrator).user
+    scenario "Do not show poll results or stats if are disabled" do
+      poll = create(:poll, :expired, results_enabled: false, stats_enabled: false)
+      question1 = create(:poll_question, poll: poll)
+      create(:poll_question_answer, question: question1, title: "Han Solo")
+      create(:poll_question_answer, question: question1, title: "Chewbacca")
+      question2 = create(:poll_question, poll: poll)
+      create(:poll_question_answer, question: question2, title: "Leia")
+      create(:poll_question_answer, question: question2, title: "Luke")
+      user = create(:user)
+      admin = create(:administrator).user
 
       login_as user
       visit poll_path(poll)
 
-      expect(page).to have_content("Poll results")
-      expect(page).to have_content("Participation statistics")
+      expect(page).not_to have_content("Poll results")
+      expect(page).not_to have_content("Participation statistics")
 
-      visit results_poll_path(poll)
-      expect(page).to have_content("Questions")
+      login_as admin
+      visit poll_path(poll)
 
-      visit stats_poll_path(poll)
-      expect(page).to have_content("Participation data")
+      expect(page).not_to have_content("Poll results")
+      expect(page).not_to have_content("Participation statistics")
     end
   end
 end

From 4498c26ff7ccddec138810dbb523fe8929262913 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Wed, 23 Jan 2019 17:45:42 +0100
Subject: [PATCH 2/2] Create helper for active menus and show stats or results
 on poll subnav

---
 app/helpers/polls_helper.rb           | 15 +++++++++++++++
 app/views/polls/_poll_subnav.html.erb |  7 ++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/helpers/polls_helper.rb b/app/helpers/polls_helper.rb
index 0cb875dff..83200c621 100644
--- a/app/helpers/polls_helper.rb
+++ b/app/helpers/polls_helper.rb
@@ -49,4 +49,19 @@ module PollsHelper
     question.answers.where(author: current_user).any? { |vote| current_user.current_sign_in_at > vote.updated_at }
   end
 
+  def show_stats_or_results?
+    @poll.expired? && (@poll.results_enabled? || @poll.stats_enabled?)
+  end
+
+  def results_menu?
+    controller_name == "polls" && action_name == "results"
+  end
+
+  def stats_menu?
+    controller_name == "polls" && action_name == "stats"
+  end
+
+  def info_menu?
+    controller_name == "polls" && action_name == "show"
+  end
 end
diff --git a/app/views/polls/_poll_subnav.html.erb b/app/views/polls/_poll_subnav.html.erb
index ff1e7434e..ec4f7590e 100644
--- a/app/views/polls/_poll_subnav.html.erb
+++ b/app/views/polls/_poll_subnav.html.erb
@@ -1,8 +1,9 @@
+<% if show_stats_or_results? %>
   <div class="row margin-top">
     <div class="small-12 column">
       <ul class="menu simple clear">
-          <% if controller_name == "polls" && action_name == "results" %>
         <% if @poll.results_enabled? %>
+          <% if results_menu? %>
             <li class="is-active">
               <h2><%= t("polls.show.results_menu") %></h2>
             </li>
@@ -11,8 +12,8 @@
           <% end %>
         <% end %>
 
-          <% if controller_name == "polls" && action_name == "stats" %>
         <% if @poll.stats_enabled? %>
+          <% if stats_menu? %>
             <li class="is-active">
               <h2><%= t("polls.show.stats_menu") %></h2>
             </li>
@@ -21,7 +22,7 @@
           <% end %>
         <% end %>
 
-        <% if controller_name == "polls" && action_name == "show" %>
+        <% if info_menu? %>
           <li class="is-active">
             <h2><%= t("polls.show.info_menu") %></h2>
           </li>