Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
97d32cbb3aed
Commit
97d32cbb
authored
Oct 03, 2012
by
Dmitriy Zaporozhets
Browse files
SQL Fixes
parent
89f70b251636
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/controllers/groups_controller.rb
View file @
97d32cbb
...
...
@@ -50,7 +50,7 @@
end
def
people
@users
=
group
.
projects
.
map
(
&
:users
).
flatten
.
uniq
@users
=
group
.
users
end
protected
...
...
app/models/group.rb
View file @
97d32cbb
...
...
@@ -23,9 +23,9 @@
delegate
:name
,
to: :owner
,
allow_nil:
true
,
prefix:
true
def
self
.
search
query
where
(
"name like :query
or
code like :query"
,
query:
"%
#{
query
}
%"
)
where
(
"name like :query
OR
code like :query"
,
query:
"%
#{
query
}
%"
)
end
def
to_param
code
end
...
...
@@ -27,6 +27,10 @@
end
def
to_param
code
end
def
users
User
.
joins
(
:users_projects
).
where
(
'users_projects.project_id'
=>
project_ids
).
uniq
end
end
app/models/project.rb
View file @
97d32cbb
...
...
@@ -30,11 +30,11 @@
# Scopes
scope
:public_only
,
where
(
private_flag:
false
)
scope
:without_user
,
->
(
user
)
{
where
(
"id
not in
(:ids)"
,
ids:
user
.
projects
.
map
(
&
:id
)
)
}
scope
:not_in_group
,
->
(
group
)
{
where
(
"id
not in
(:ids)"
,
ids:
group
.
project_ids
)
}
scope
:without_user
,
->
(
user
)
{
where
(
"id
NOT IN
(:ids)"
,
ids:
user
.
projects
.
map
(
&
:id
)
)
}
scope
:not_in_group
,
->
(
group
)
{
where
(
"id
NOT IN
(:ids)"
,
ids:
group
.
project_ids
)
}
def
self
.
active
joins
(
:issues
,
:notes
,
:merge_requests
).
order
(
"issues.created_at, notes.created_at, merge_requests.created_at DESC"
)
end
def
self
.
search
query
...
...
@@ -35,10 +35,10 @@
def
self
.
active
joins
(
:issues
,
:notes
,
:merge_requests
).
order
(
"issues.created_at, notes.created_at, merge_requests.created_at DESC"
)
end
def
self
.
search
query
where
(
"name like :query
or
code like :query
or
path like :query"
,
query:
"%
#{
query
}
%"
)
where
(
"name like :query
OR
code like :query
OR
path like :query"
,
query:
"%
#{
query
}
%"
)
end
def
self
.
create_by_user
(
params
,
user
)
...
...
Write
Preview
Supports
Markdown
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