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
b813a488
Commit
b813a488
authored
Nov 05, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove User#namespaces method from code
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
6424ec93
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
7 deletions
+9
-7
app/helpers/namespaces_helper.rb
app/helpers/namespaces_helper.rb
+2
-2
app/models/user.rb
app/models/user.rb
+7
-3
spec/models/user_spec.rb
spec/models/user_spec.rb
+0
-2
No files found.
app/helpers/namespaces_helper.rb
View file @
b813a488
module
NamespacesHelper
def
namespaces_options
(
selected
=
:current_user
,
scope
=
:default
)
groups
=
current_user
.
owned_groups
.
select
{
|
n
|
n
.
type
==
'Group'
}
users
=
current_user
.
namespaces
.
reject
{
|
n
|
n
.
type
==
'Group'
}
groups
=
current_user
.
owned_groups
users
=
[
current_user
.
namespace
]
group_opts
=
[
"Groups"
,
groups
.
sort_by
(
&
:human_name
).
map
{
|
g
|
[
g
.
human_name
,
g
.
id
]}
]
users_opts
=
[
"Users"
,
users
.
sort_by
(
&
:human_name
).
map
{
|
u
|
[
u
.
human_name
,
u
.
id
]}
]
...
...
app/models/user.rb
View file @
b813a488
...
...
@@ -82,8 +82,6 @@ class User < ActiveRecord::Base
has_many
:personal_projects
,
through: :namespace
,
source: :projects
has_many
:projects
,
through: :users_projects
has_many
:created_projects
,
foreign_key: :creator_id
,
class_name:
'Project'
has_many
:owned_projects
,
through: :owned_groups
,
source: :projects
has_many
:snippets
,
dependent: :destroy
,
foreign_key: :author_id
,
class_name:
"Snippet"
has_many
:users_projects
,
dependent: :destroy
...
...
@@ -258,6 +256,12 @@ class User < ActiveRecord::Base
end
end
def
owned_projects
@owned_projects
||=
begin
Project
.
where
(
namespace_id:
owned_groups
.
pluck
(
:id
).
push
(
namespace
.
id
)).
joins
(
:namespace
)
end
end
# Team membership in authorized projects
def
tm_in_authorized_projects
UsersProject
.
where
(
project_id:
authorized_projects
.
map
(
&
:id
),
user_id:
self
.
id
)
...
...
@@ -330,7 +334,7 @@ class User < ActiveRecord::Base
end
def
several_namespaces?
namespaces
.
many?
||
owned_groups
.
any?
owned_groups
.
any?
end
def
namespace_id
...
...
spec/models/user_spec.rb
View file @
b813a488
...
...
@@ -135,7 +135,6 @@ describe User do
end
it
{
@user
.
several_namespaces?
.
should
be_true
}
it
{
@user
.
namespaces
.
should
include
(
@user
.
namespace
)
}
it
{
@user
.
authorized_groups
.
should
==
[
@group
]
}
it
{
@user
.
owned_groups
.
should
==
[
@group
]
}
end
...
...
@@ -162,7 +161,6 @@ describe User do
end
it
{
@user
.
several_namespaces?
.
should
be_false
}
it
{
@user
.
namespaces
.
should
==
[
@user
.
namespace
]
}
end
describe
'blocking user'
do
...
...
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