Errors after running Travis fixed

2017-11-17 14:07:02 +01:00
parent 90f8ad2663
commit 2fafceb81d
2 changed files with 7 additions and 7 deletions
--- 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