Merge pull request #589 from axsh/fix-accountless-gui-crash

Fix accountless GUI crash
axsh · May 25, 2015 · 86e037a · 86e037a
2 parents bfb5438 + b661b3e
commit 86e037a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/frontend/dcmgr_gui/app/controllers/sessions_controller.rb b/frontend/dcmgr_gui/app/controllers/sessions_controller.rb
@@ -41,7 +41,7 @@ def create
     end
     user = User.authenticate(params[:login], params[:password])
 
-    if user
+    if user && user.primary_account
       self.current_user = user
       user.update_last_login
       redirect_back_or_default('/', :notice => "Logged in successfully")

diff --git a/frontend/dcmgr_gui/app/models/user.rb b/frontend/dcmgr_gui/app/models/user.rb
@@ -37,7 +37,7 @@ def before_destroy
   end
 
   def is_system_manager?
-    self.primary_account.is_admin
+    !! (self.primary_account && self.primary_account.is_admin)
   end
 
   def primary_account