Refactor project creation. Added logout link to profile page

1 files changed, 6 insertions, 5 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index 7e69f3db84c..7a75379e500 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -152,11 +152,8 @@ class User < ActiveRecord::Base
     namespaces << self.namespace if self.namespace
 
     # Add groups you can manage
-    namespaces += if admin
-                    Group.all
-                  else
-                    groups.all
-                  end
+    namespaces += groups.all
+
     namespaces
   end
 
@@ -234,6 +231,10 @@ class User < ActiveRecord::Base
                    end
   end
 
+  def can_select_namespace?
+    several_namespaces? || admin
+  end
+
   def can? action, subject
     abilities.allowed?(self, action, subject)
   end