User#owned_groups is now respect group membership

1 files changed, 2 insertions, 5 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index ddea2da53e8..30f5aae0b56 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -74,6 +74,8 @@ class User < ActiveRecord::Base
 
   # Groups
   has_many :own_groups, class_name: "Group", foreign_key: :owner_id
+  has_many :owned_groups, through: :users_groups, source: :group, conditions: { users_groups: { group_access: UsersGroup::OWNER } }
+
   has_many :users_groups, dependent: :destroy
   has_many :groups, through: :users_groups
 
@@ -225,11 +227,6 @@ class User < ActiveRecord::Base
     end
   end
 
-  # Groups where user is an owner
-  def owned_groups
-    own_groups
-  end
-
   # Groups user has access to
   def authorized_groups
     @authorized_groups ||= begin