diff options
| author | Felipe Artur <felipefac@gmail.com> | 2017-06-26 12:09:40 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2017-07-04 17:40:06 -0300 |
| commit | 563f7683528a3aeee22b91c276377e14bf8f4ded (patch) | |
| tree | 71fb1644a36f7d19dd5c2fc9e9b5ae836a45994a | |
| parent | b5c9a0aa39d70011a60fb997dd13ae423d2e9e27 (diff) | |
| download | gitlab-ce-563f7683528a3aeee22b91c276377e14bf8f4ded.tar.gz | |
Fix view problem with dashboard milestones
| -rw-r--r-- | app/models/global_milestone.rb | 2 | ||||
| -rw-r--r-- | app/views/shared/milestones/_milestone.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/global_milestone.rb b/app/models/global_milestone.rb index afe680a7202..8ef4546ee24 100644 --- a/app/models/global_milestone.rb +++ b/app/models/global_milestone.rb @@ -12,7 +12,7 @@ class GlobalMilestone end def self.build_collection(projects, params) - child_milestones = ProjectMilestonesFinder.new.execute(projects, params) + child_milestones = ProjectMilestonesFinder.new(projects, params).execute milestones = child_milestones.select(:id, :title).group_by(&:title).map do |title, grouped| milestones_relation = Milestone.where(id: grouped.map(&:id)) diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index 55444139542..d0acf575cbe 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -1,5 +1,5 @@ - dashboard = local_assigns[:dashboard] -- custom_dom_id = dom_id(milestone) +- custom_dom_id = "milestone_#{milestone.title}" %li{ class: "milestone milestone-#{milestone.closed? ? 'closed' : 'open'}", id: custom_dom_id } .row |