The admin menu is shown in the management section if the user who logged in is an admin

This commit is contained in:
iagirre
2017-11-17 11:41:44 +01:00
committed by Angel Perez
parent 81d8b9b9ed
commit 7a7ae5fa2e
4 changed files with 19 additions and 8 deletions

View File

@@ -6,6 +6,7 @@ class Management::BaseController < ActionController::Base
helper_method :managed_user
helper_method :current_user
helper_method :user_signed_in
private
@@ -22,7 +23,10 @@ class Management::BaseController < ActionController::Base
end
def managed_user
@managed_user ||= Verification::Management::ManagedUser.find(session[:document_type], session[:document_number])
@managed_user ||= Verification::Management::ManagedUser.find(
session[:document_type],
session[:document_number]
)
end
def check_verified_user(alert_msg)
@@ -49,4 +53,11 @@ class Management::BaseController < ActionController::Base
def clear_password
session[:new_password] = nil
end
def user_signed_in
if current_manager
@user_signed_in = User.find(session[:manager]["login"].last(1))
end
end
end

View File

@@ -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.administrator?
end
def interests_title_text(user)

View File

@@ -29,14 +29,14 @@
</li>
</ul>
</div>
<% if current_administrator? %>
<% if user_signed_in.administrator? %>
<div id="responsive_menu">
<div class="top-bar-right">
<ul class="menu" data-responsive-menu="medium-dropdown">
<%= render "admin/shared/admin_shortcuts" %>
<%= render "shared/admin_login_items" %>
<%= render "devise/menu/login_items" %>
<%= render "admin/shared/admin_shortcuts", current_user: user_signed_in %>
<%= render "shared/admin_login_items", current_user: user_signed_in %>
<%= render "devise/menu/login_items", current_user: user_signed_in %>
</ul>
</div>

View File

@@ -1,4 +1,4 @@
<% if show_admin_menu? %>
<% if show_admin_menu?(current_user) %>
<li class="has-submenu">
<%= link_to t("layouts.header.administration_menu"), "#", rel: "nofollow", class: "hide-for-small-only" %>
<ul class="submenu menu vertical" data-submenu>