Download as
Browse Code »

Commit c2c11e655f055353d9eddb6544cf5f1a4d01509f

Authored by Dmitriy Zaporozhets
2 parents 317e8d12 e19526c2
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #5041 from stecman/several-namespaces-fix 

Fix user.several_namespaces? to work with multiple ownership of groups
Showing 2 changed files with 14 additions and 1 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @c2c11e6
... ... @@ -322,7 +322,7 @@ class User < ActiveRecord::Base
322 322 end
323 323  
324 324 def several_namespaces?
325   - namespaces.many?
  325 + namespaces.many? || owned_groups.any?
326 326 end
327 327  
328 328 def namespace_id
... ...
spec/models/user_spec.rb
  Diff comments   View file @c2c11e6
... ... @@ -139,6 +139,19 @@ describe User do
139 139 it { @user.owned_groups.should == [@group] }
140 140 end
141 141  
  142 + describe 'group multiple owners' do
  143 + before do
  144 + ActiveRecord::Base.observers.enable(:user_observer)
  145 + @user = create :user
  146 + @user2 = create :user
  147 + @group = create :group, owner: @user
  148 +
  149 + @group.add_users([@user2.id], UsersGroup::OWNER)
  150 + end
  151 +
  152 + it { @user2.several_namespaces?.should be_true }
  153 + end
  154 +
142 155 describe 'namespaced' do
143 156 before do
144 157 ActiveRecord::Base.observers.enable(:user_observer)
... ...