diff options
| author | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-06-18 19:34:59 +0300 |
|---|---|---|
| committer | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-06-18 19:34:59 +0300 |
| commit | 8b2a6d41d5359dbfdd5a159f0cce602f36785e1e (patch) | |
| tree | 7d1af37deb1a4239081dd9e1b49c57cdcb12c700 /app/views/shared/milestones/_milestone.html.haml | |
| parent | d2daa6183251a1ce0397f4a50395dd171ec2a7eb (diff) | |
updated placement of milestone type for dashboard milestone list
Diffstat (limited to 'app/views/shared/milestones/_milestone.html.haml')
| -rw-r--r-- | app/views/shared/milestones/_milestone.html.haml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index d263b4288c5..725698226ac 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -1,14 +1,13 @@ - dashboard = local_assigns[:dashboard] - custom_dom_id = dom_id(milestone.try(:milestones) ? milestone.milestones.first : milestone) +- milestone_type = milestone.group_milestone? ? 'Group Milestone' : 'Project Milestone' %li{ class: "milestone milestone-#{milestone.closed? ? 'closed' : 'open'}", id: custom_dom_id } .row .col-sm-6 %strong= link_to truncate(milestone.title, length: 100), milestone_path - - if milestone.group_milestone? - %span - Group Milestone - - else - %span - Project Milestone + - unless dashboard + = milestone_type - if @project || milestone.is_a?(GlobalMilestone) || milestone.group_milestone? = render('shared/milestone_expired', milestone: milestone) @@ -50,9 +49,10 @@ = link_to 'Reopen Milestone', group_milestone_route(milestone, {state_event: :activate }), method: :put, class: "btn btn-sm btn-grouped btn-reopen" - else = link_to 'Close Milestone', group_milestone_route(milestone, {state_event: :close }), method: :put, class: "btn btn-sm btn-grouped btn-close" + - if dashboard + .status-box.status-box-upcoming + = milestone_type + - - if milestone.is_a?(GlobalMilestone) || milestone.group_milestone? - .row - .col-sm-6 |