[ARVADOS] updated: 6c7373c9d66ab358ea48ea7c1d0e59551364e064

[git at public.curoverse.com]

Summary of changes:
 services/api/app/models/user.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

       via  6c7373c9d66ab358ea48ea7c1d0e59551364e064 (commit)
      from  29e5eb86b1dbbb644c244ec6e08e935c06e50d1c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 6c7373c9d66ab358ea48ea7c1d0e59551364e064
Author: Ward Vandewege <ward at curoverse.com>
Date:   Tue Jul 29 00:43:14 2014 +0200

    Fix the auto_admin_user feature; it was broken by accident in
    commit:5f651773
    
    refs #3219

diff --git a/services/api/app/models/user.rb b/services/api/app/models/user.rb
index 6547585..d27b4fe 100644
--- a/services/api/app/models/user.rb
+++ b/services/api/app/models/user.rb
@@ -218,7 +218,7 @@ class User < ArvadosModel
 
   def check_auto_admin
     if User.where("uuid not like '%-000000000000000'").where(:is_admin => true).count == 0 and Rails.configuration.auto_admin_user
-      if current_user.email == Rails.configuration.auto_admin_user
+      if self.email == Rails.configuration.auto_admin_user
         self.is_admin = true
         self.is_active = true
       end

-----------------------------------------------------------------------


hooks/post-receive
--