consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Errors after running Travis fixed

Browse Source
This commit is contained in:
iagirre
2017-11-17 14:07:02 +01:00
committed by Angel Perez
parent 90f8ad2663
commit 2fafceb81d
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/management/base_controller.rb
View File

@@ -6,7 +6,7 @@ class Management::BaseController < ActionController::Base
helper_method :managed_user helper_method :managed_user
helper_method :current_user helper_method :current_user
helper_method :user_signed_in helper_method :manager_logged_in
private private
@@ -54,9 +54,9 @@ class Management::BaseController < ActionController::Base
session[:new_password] = nil session[:new_password] = nil
end end
def user_signed_in def manager_logged_in
if current_manager if current_manager
@user_signed_in = User.find(session[:manager]["login"].last(1)) @manager_logged_in = User.find_by(id: session[:manager]["login"].last(1))
end end
end end

8
app/views/layouts/management.html.erb
View File

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