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
39e3284e822b
Commit
39e3284e
authored
Apr 22, 2016
by
Takuya Noguchi
Browse files
Use outer join for issues ordering by milestones due.
parent
4ef45667b734
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/models/concerns/issuable.rb
View file @
39e3284e
...
...
@@ -35,10 +35,10 @@
scope
:only_opened
,
->
{
with_state
(
:opened
)
}
scope
:only_reopened
,
->
{
with_state
(
:reopened
)
}
scope
:closed
,
->
{
with_state
(
:closed
)
}
scope
:order_milestone_due_desc
,
->
{
join
s
(
:
milestone
)
.
reorder
(
'milestones.due_date DESC, milestones.id DESC'
)
}
scope
:order_milestone_due_asc
,
->
{
join
s
(
:
milestone
)
.
reorder
(
'milestones.due_date ASC, milestones.id ASC'
)
}
scope
:order_milestone_due_desc
,
->
{
outer_
join
_
milestone
.
reorder
(
'milestones.due_date
IS NULL ASC, milestones.due_date
DESC, milestones.id DESC'
)
}
scope
:order_milestone_due_asc
,
->
{
outer_
join
_
milestone
.
reorder
(
'milestones.due_date
IS NULL ASC, milestones.due_date
ASC, milestones.id ASC'
)
}
scope
:without_label
,
->
{
joins
(
"LEFT OUTER JOIN label_links ON label_links.target_type = '
#{
name
}
' AND label_links.target_id =
#{
table_name
}
.id"
).
where
(
label_links:
{
id:
nil
})
}
scope
:join_project
,
->
{
joins
(
:project
)
}
scope
:references_project
,
->
{
references
(
:project
)
}
scope
:non_archived
,
->
{
join_project
.
where
(
projects:
{
archived:
false
})
}
...
...
@@ -40,8 +40,9 @@
scope
:without_label
,
->
{
joins
(
"LEFT OUTER JOIN label_links ON label_links.target_type = '
#{
name
}
' AND label_links.target_id =
#{
table_name
}
.id"
).
where
(
label_links:
{
id:
nil
})
}
scope
:join_project
,
->
{
joins
(
:project
)
}
scope
:references_project
,
->
{
references
(
:project
)
}
scope
:non_archived
,
->
{
join_project
.
where
(
projects:
{
archived:
false
})
}
scope
:outer_join_milestone
,
->
{
joins
(
"LEFT OUTER JOIN milestones ON milestones.id =
#{
table_name
}
.milestone_id"
)
}
delegate
:name
,
:email
,
...
...
spec/features/issues_spec.rb
View file @
39e3284e
...
...
@@ -264,9 +264,10 @@
visit
namespace_project_issues_path
(
project
.
namespace
,
project
,
sort:
sort_value_milestone_soon
)
expect
(
first_issue
).
to
include
(
'foo'
)
expect
(
last_issue
).
to
include
(
'baz'
)
end
it
'sorts by least recently due milestone'
do
visit
namespace_project_issues_path
(
project
.
namespace
,
project
,
sort:
sort_value_milestone_later
)
expect
(
first_issue
).
to
include
(
'bar'
)
...
...
@@ -267,9 +268,10 @@
end
it
'sorts by least recently due milestone'
do
visit
namespace_project_issues_path
(
project
.
namespace
,
project
,
sort:
sort_value_milestone_later
)
expect
(
first_issue
).
to
include
(
'bar'
)
expect
(
last_issue
).
to
include
(
'baz'
)
end
end
...
...
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