Merge pull request #2137 from wairbut-m2c/iagirre-admin-menu-in-management

Add admin menu in management view (if user is admin)
2018-07-27 12:35:07 +02:00
parent fb19aafee7 6e238ae252
commit 65e4435822
6 changed files with 62 additions and 5 deletions
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -52,8 +52,8 @@ module UsersHelper
    current_user && current_user.manager?
  end

-  def show_admin_menu?
-    current_administrator? || current_moderator? || current_valuator? || current_manager?
+  def show_admin_menu?(user = nil)
+    current_administrator? || current_moderator? || current_valuator? || current_manager? || (user && user.administrator?)
  end

  def interests_title_text(user)