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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
16d02de5
Commit
16d02de5
authored
Mar 16, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed issue with dashboard issues not reloading
parent
882ebfc2
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
6 deletions
+17
-6
app/assets/javascripts/labels_select.js.coffee
app/assets/javascripts/labels_select.js.coffee
+7
-2
app/assets/javascripts/milestone_select.js.coffee
app/assets/javascripts/milestone_select.js.coffee
+5
-1
app/assets/javascripts/users_select.js.coffee
app/assets/javascripts/users_select.js.coffee
+5
-1
spec/features/merge_requests/filter_by_milestone_spec.rb
spec/features/merge_requests/filter_by_milestone_spec.rb
+0
-2
No files found.
app/assets/javascripts/labels_select.js.coffee
View file @
16d02de5
...
@@ -58,6 +58,7 @@ class @LabelsSelect
...
@@ -58,6 +58,7 @@ class @LabelsSelect
if
showAny
if
showAny
data
.
unshift
(
data
.
unshift
(
any
:
true
title
:
'Any Label'
title
:
'Any Label'
)
)
...
@@ -91,11 +92,15 @@ class @LabelsSelect
...
@@ -91,11 +92,15 @@ class @LabelsSelect
defaultLabel
defaultLabel
fieldName
:
$
(
dropdown
).
data
(
'field-name'
)
fieldName
:
$
(
dropdown
).
data
(
'field-name'
)
id
:
(
label
)
->
id
:
(
label
)
->
if
label
.
title
is
"Any Label"
if
label
.
any
?
""
""
else
else
label
.
title
label
.
title
clicked
:
->
clicked
:
->
if
$
(
dropdown
).
hasClass
"js-filter-submit"
page
=
$
(
"body"
).
data
"page"
if
$
(
dropdown
).
hasClass
(
"js-filter-submit"
)
&&
page
is
"projects:issues:index"
Issues
.
filterResults
$
(
dropdown
).
parents
(
"form"
)
Issues
.
filterResults
$
(
dropdown
).
parents
(
"form"
)
else
if
$
(
dropdown
).
hasClass
"js-filter-submit"
$
(
dropdown
).
parents
(
"form"
).
submit
()
)
)
app/assets/javascripts/milestone_select.js.coffee
View file @
16d02de5
...
@@ -62,6 +62,10 @@ class @MilestoneSelect
...
@@ -62,6 +62,10 @@ class @MilestoneSelect
isSelected
:
(
milestone
)
->
isSelected
:
(
milestone
)
->
milestone
.
title
is
selectedMilestone
milestone
.
title
is
selectedMilestone
clicked
:
->
clicked
:
->
if
$
(
dropdown
).
hasClass
"js-filter-submit"
page
=
$
(
"body"
).
data
"page"
if
$
(
dropdown
).
hasClass
(
"js-filter-submit"
)
&&
page
is
"projects:issues:index"
Issues
.
filterResults
$
(
dropdown
).
parents
(
"form"
)
Issues
.
filterResults
$
(
dropdown
).
parents
(
"form"
)
else
if
$
(
dropdown
).
hasClass
"js-filter-submit"
$
(
dropdown
).
parents
(
"form"
).
submit
()
)
)
app/assets/javascripts/users_select.js.coffee
View file @
16d02de5
...
@@ -60,8 +60,12 @@ class @UsersSelect
...
@@ -60,8 +60,12 @@ class @UsersSelect
else
else
defaultLabel
defaultLabel
clicked
:
->
clicked
:
->
if
$
(
dropdown
).
hasClass
"js-filter-submit"
page
=
$
(
"body"
).
data
"page"
if
$
(
dropdown
).
hasClass
(
"js-filter-submit"
)
&&
page
is
"projects:issues:index"
Issues
.
filterResults
$
(
dropdown
).
parents
(
"form"
)
Issues
.
filterResults
$
(
dropdown
).
parents
(
"form"
)
else
if
$
(
dropdown
).
hasClass
"js-filter-submit"
$
(
dropdown
).
parents
(
"form"
).
submit
()
renderRow
:
(
user
)
->
renderRow
:
(
user
)
->
username
=
if
user
.
username
then
"@
#{
user
.
username
}
"
else
""
username
=
if
user
.
username
then
"@
#{
user
.
username
}
"
else
""
avatar
=
if
user
.
avatar_url
then
user
.
avatar_url
else
false
avatar
=
if
user
.
avatar_url
then
user
.
avatar_url
else
false
...
...
spec/features/merge_requests/filter_by_milestone_spec.rb
View file @
16d02de5
...
@@ -30,8 +30,6 @@ feature 'Merge Request filtering by Milestone', feature: true do
...
@@ -30,8 +30,6 @@ feature 'Merge Request filtering by Milestone', feature: true do
def
filter_by_milestone
(
title
)
def
filter_by_milestone
(
title
)
find
(
".js-milestone-select"
).
click
find
(
".js-milestone-select"
).
click
sleep
0.5
find
(
".milestone-filter a"
,
text:
title
).
click
find
(
".milestone-filter a"
,
text:
title
).
click
sleep
1
end
end
end
end
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