From 2fafceb81dcc37959542cc28bbd258e7b68c5fa4 Mon Sep 17 00:00:00 2001
From: iagirre <itziar.agirre@m2c.es>
Date: Fri, 17 Nov 2017 14:07:02 +0100
Subject: [PATCH] Errors after running Travis fixed

---
 app/controllers/management/base_controller.rb | 6 +++---
 app/views/layouts/management.html.erb         | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/management/base_controller.rb b/app/controllers/management/base_controller.rb
index c5d8edec3..1bae36a76 100644
--- a/app/controllers/management/base_controller.rb
+++ b/app/controllers/management/base_controller.rb
@@ -6,7 +6,7 @@ class Management::BaseController < ActionController::Base
 
   helper_method :managed_user
   helper_method :current_user
-  helper_method :user_signed_in
+  helper_method :manager_logged_in
 
   private
 
@@ -54,9 +54,9 @@ class Management::BaseController < ActionController::Base
       session[:new_password] = nil
     end
 
-    def user_signed_in
+    def manager_logged_in
       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
 
diff --git a/app/views/layouts/management.html.erb b/app/views/layouts/management.html.erb
index 9fc4f411f..e964676aa 100644
--- a/app/views/layouts/management.html.erb
+++ b/app/views/layouts/management.html.erb
@@ -29,14 +29,14 @@
               </li>
             </ul>
           </div>
-          <% if user_signed_in.administrator? %>
+          <% if show_admin_menu?(manager_logged_in) %>
             <div id="responsive_menu">
 
               <div class="top-bar-right">
                 <ul class="menu" data-responsive-menu="medium-dropdown">
-                  <%= 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 %>
+                  <%= render "admin/shared/admin_shortcuts", current_user: manager_logged_in %>
+                  <%= render "shared/admin_login_items", current_user: manager_logged_in %>
+                  <%= render "devise/menu/login_items", current_user: manager_logged_in %>
                 </ul>
               </div>