From c68923c5a81d8700d8f636e094804427656abf3e Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Fri, 1 Sep 2017 18:31:03 +0200
Subject: [PATCH 1/3] adds helper to prevent show empty admin menu

---
 app/helpers/users_helper.rb                  | 26 ++++++++++++++++++++
 app/views/shared/_admin_login_items.html.erb |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index e7aeb5a21..9405a607a 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -40,6 +40,32 @@ module UsersHelper
     current_user && current_user.administrator?
   end
 
+  def current_moderator?
+    current_user && current_user.moderator?
+  end
+
+  def current_valuator?
+    current_user && current_user.valuator?
+  end
+
+  def current_manager?
+    current_user && current_user.manager?
+  end
+
+  def current_poll_officer?
+    current_user && current_user.poll_officer? && Poll.current.any?
+  end
+
+  def show_admin_menu?
+    if current_user
+      current_administrator? ||
+      current_moderator? ||
+      current_valuator? ||
+      current_manager? ||
+      current_poll_officer?
+    end
+  end
+
   def interests_title_text(user)
     if current_user == user
       t('account.show.public_interests_my_title_list')
diff --git a/app/views/shared/_admin_login_items.html.erb b/app/views/shared/_admin_login_items.html.erb
index 7bd673a30..85a367e97 100644
--- a/app/views/shared/_admin_login_items.html.erb
+++ b/app/views/shared/_admin_login_items.html.erb
@@ -1,4 +1,4 @@
-<% if current_user %>
+<% if show_admin_menu? %>
 <li>
   <%= link_to t("layouts.header.administration_menu"), "#", rel: "nofollow" %>
   <ul class="menu">

From dd6ad5294c55cabe1fb0bed79f4262c3dac50754 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Fri, 1 Sep 2017 19:01:19 +0200
Subject: [PATCH 2/3] improves show_admin_menu helper

---
 app/helpers/users_helper.rb | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 9405a607a..9f4da03dc 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -57,13 +57,7 @@ module UsersHelper
   end
 
   def show_admin_menu?
-    if current_user
-      current_administrator? ||
-      current_moderator? ||
-      current_valuator? ||
-      current_manager? ||
-      current_poll_officer?
-    end
+    current_administrator? || current_moderator? || current_valuator? || current_manager? || current_poll_officer?
   end
 
   def interests_title_text(user)

From d676018a233af64d049553eeb3a22d53a902eb91 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Fri, 1 Sep 2017 20:52:43 +0200
Subject: [PATCH 3/3] remove condition on current poll officer helper

---
 app/helpers/users_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 9f4da03dc..111a80267 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -53,7 +53,7 @@ module UsersHelper
   end
 
   def current_poll_officer?
-    current_user && current_user.poll_officer? && Poll.current.any?
+    current_user && current_user.poll_officer?
   end
 
   def show_admin_menu?