Fix several_namespaces? to work with multiple ownership of groups

2 files changed, 14 insertions, 1 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index a149b3a0322..53e60747df8 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -319,7 +319,7 @@ class User < ActiveRecord::Base
   end
 
   def several_namespaces?
-    namespaces.many?
+    namespaces.many? || owned_groups.any?
   end
 
   def namespace_id
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index eb8ffa5aafe..45208a9486a 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -139,6 +139,19 @@ describe User do
     it { @user.owned_groups.should == [@group] }
   end
 
+  describe 'group multiple owners' do
+    before do
+      ActiveRecord::Base.observers.enable(:user_observer)
+      @user = create :user
+      @user2 = create :user
+      @group = create :group, owner: @user
+
+      @group.add_users([@user2.id], UsersGroup::OWNER)
+    end
+
+    it { @user2.several_namespaces?.should be_true }
+  end
+
   describe 'namespaced' do
     before do
       ActiveRecord::Base.observers.enable(:user_observer)