diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 13e537835..547b25787 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -52,8 +52,15 @@ module UsersHelper current_user && current_user.manager? end + def current_poll_officer? + current_user && current_user.poll_officer? + end + def show_admin_menu?(user = nil) - current_administrator? || current_moderator? || current_valuator? || current_manager? || (user && user.administrator?) + unless namespace == "officing" + current_administrator? || current_moderator? || current_valuator? || current_manager? || + (user && user.administrator?) || current_poll_officer? + end end def interests_title_text(user) diff --git a/app/views/admin/shared/_admin_shortcuts.html.erb b/app/views/admin/shared/_admin_shortcuts.html.erb deleted file mode 100644 index 5371cd27e..000000000 --- a/app/views/admin/shared/_admin_shortcuts.html.erb +++ /dev/null @@ -1,18 +0,0 @@ -<% if current_user.administrator? %> -