17778: Merge branch 'master' into 17778-doc-update

[arvados.git] / apps / workbench / app / models / user.rb

diff --git a/apps/workbench/app/models/user.rb b/apps/workbench/app/models/user.rb
index d30b472a06dc49e3e62b13b463c6888a8b8358c1..c4b273c6b81e81cbcccd0034ee1aff1bf5a07424 100644 (file)
--- a/apps/workbench/app/models/user.rb
+++ b/apps/workbench/app/models/user.rb
@@ -40,7 +40,8 @@ class User < ArvadosBase
     # Create a project owned by user_a to accept everything owned by user_b
     res = arvados_api_client.api Group, nil, {:group => {
                                                 :name => new_group_name,
-                                                :group_class => "project"}},
+                                                :group_class => "project"},
+                                              :ensure_unique_name => true},
                                  {:arvados_api_token => user_a}, false
     target = arvados_api_client.unpack_api_response(res)
 
@@ -108,7 +109,7 @@ class User < ArvadosBase
     false
   end
 
-   def self.creatable?
-    current_user and current_user.is_admin
-   end
+  def self.creatable?
+    current_user.andand.is_admin
+  end
 end