Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
0273b79b
Commit
0273b79b
authored
Jun 21, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
User#owned_groups is now respect group membership
parent
be26d272
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
5 deletions
+2
-5
app/models/user.rb
app/models/user.rb
+2
-5
No files found.
app/models/user.rb
View file @
0273b79b
...
@@ -74,6 +74,8 @@ class User < ActiveRecord::Base
...
@@ -74,6 +74,8 @@ class User < ActiveRecord::Base
# Groups
# Groups
has_many
:own_groups
,
class_name:
"Group"
,
foreign_key: :owner_id
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
:users_groups
,
dependent: :destroy
has_many
:groups
,
through: :users_groups
has_many
:groups
,
through: :users_groups
...
@@ -225,11 +227,6 @@ class User < ActiveRecord::Base
...
@@ -225,11 +227,6 @@ class User < ActiveRecord::Base
end
end
end
end
# Groups where user is an owner
def
owned_groups
own_groups
end
# Groups user has access to
# Groups user has access to
def
authorized_groups
def
authorized_groups
@authorized_groups
||=
begin
@authorized_groups
||=
begin
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment