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
Léo-Paul Géneau
gitlab-ce
Commits
eb49e28c
Commit
eb49e28c
authored
Jul 17, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed milestone dropdown tests
parent
02ce5fba
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
app/helpers/milestones_helper.rb
app/helpers/milestones_helper.rb
+6
-0
app/views/shared/issuable/_milestone_dropdown.html.haml
app/views/shared/issuable/_milestone_dropdown.html.haml
+3
-3
No files found.
app/helpers/milestones_helper.rb
View file @
eb49e28c
...
@@ -55,6 +55,12 @@ module MilestonesHelper
...
@@ -55,6 +55,12 @@ module MilestonesHelper
end
end
end
end
def
milestone_dropdown_selected_text
project
=
@target_project
||
@project
||
@projects
Milestone
.
of_projects
(
project
).
where
(
title:
params
[
:milestone_title
]).
first
().
try
(
:name
)
end
def
milestone_remaining_days
(
milestone
)
def
milestone_remaining_days
(
milestone
)
if
milestone
.
expired?
if
milestone
.
expired?
content_tag
(
:strong
,
'Past due'
)
content_tag
(
:strong
,
'Past due'
)
...
...
app/views/shared/issuable/_milestone_dropdown.html.haml
View file @
eb49e28c
-
project
=
@target_project
||
@project
-
project
=
@target_project
||
@project
||
@projects
-
extra_class
=
extra_class
||
''
-
extra_class
=
extra_class
||
''
-
selected_text
=
project
.
milestones
.
find_by_id
(
selected
).
try
(
:name
)
-
selected_text
=
milestone_dropdown_selected_text
-
if
selected
.
present?
-
if
selected
.
present?
=
hidden_field_tag
(
name
,
selected
)
=
hidden_field_tag
(
name
,
selected
)
=
dropdown_tag
(
milestone_dropdown_label
(
selected_text
),
options:
{
title:
"Filter by milestone"
,
toggle_class:
"js-milestone-select js-filter-submit
#{
extra_class
}
"
,
filter:
true
,
dropdown_class:
"dropdown-menu-selectable"
,
=
dropdown_tag
(
milestone_dropdown_label
(
selected_text
),
options:
{
title:
"Filter by milestone"
,
toggle_class:
"js-milestone-select js-filter-submit
#{
extra_class
}
"
,
filter:
true
,
dropdown_class:
"dropdown-menu-selectable"
,
placeholder:
"Search milestones"
,
footer_content:
project
.
present?
,
data:
{
show_no:
true
,
show_any:
show_any
,
show_upcoming:
show_upcoming
,
field_name:
name
,
selected:
selected
,
project_id:
project
.
try
(
:id
),
milestones:
milestones_filter_dropdown_path
,
default_label:
"Milestone"
}
})
do
placeholder:
"Search milestones"
,
footer_content:
project
.
present?
,
data:
{
show_no:
true
,
show_any:
show_any
,
show_upcoming:
show_upcoming
,
field_name:
name
,
selected:
selected
,
project_id:
project
.
try
(
:id
),
milestones:
milestones_filter_dropdown_path
,
default_label:
"Milestone"
}
})
do
-
if
project
-
if
project
&&
project
.
respond_to?
(
:namespace
)
%ul
.dropdown-footer-list
%ul
.dropdown-footer-list
-
if
can?
current_user
,
:admin_milestone
,
project
-
if
can?
current_user
,
:admin_milestone
,
project
%li
%li
...
...
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