diff options
author | Rubén Dávila <rdavila84@gmail.com> | 2016-02-24 03:31:59 +0300 |
---|---|---|
committer | Rubén Dávila <rdavila84@gmail.com> | 2016-03-05 06:37:03 +0300 |
commit | e0a18829ee7f1d681500002a2b6bda122b64b4c7 (patch) | |
tree | 35b11b7133ac07d9017c8bd4a21d4013fd70a74e /app/views/shared | |
parent | 32f8fc1f9a493dca41f5b67a15bb7ff37e5d78c9 (diff) |
Show project name for Issues tab in Group and Dashboard context.
Diffstat (limited to 'app/views/shared')
-rw-r--r-- | app/views/shared/milestones/_issue.html.haml | 4 | ||||
-rw-r--r-- | app/views/shared/milestones/_issues.html.haml | 2 | ||||
-rw-r--r-- | app/views/shared/milestones/_issues_tab.html.haml | 9 |
3 files changed, 11 insertions, 4 deletions
diff --git a/app/views/shared/milestones/_issue.html.haml b/app/views/shared/milestones/_issue.html.haml index be55c5b6fe0..dbef742ebe8 100644 --- a/app/views/shared/milestones/_issue.html.haml +++ b/app/views/shared/milestones/_issue.html.haml @@ -3,6 +3,10 @@ %li{ id: dom_id(issue, 'sortable'), class: 'issue-row', 'data-iid' => issue.iid, 'data-url' => issue_path(issue) } %span + - if show_project_name + %strong #{project.name} · + - elsif show_full_project_name + %strong #{project.name_with_namespace} · = link_to_gfm issue.title, [project.namespace.becomes(Namespace), project, issue], title: issue.title .issue-detail = link_to [project.namespace.becomes(Namespace), project, issue] do diff --git a/app/views/shared/milestones/_issues.html.haml b/app/views/shared/milestones/_issues.html.haml index e1b5c2eb66c..04053eb854b 100644 --- a/app/views/shared/milestones/_issues.html.haml +++ b/app/views/shared/milestones/_issues.html.haml @@ -4,4 +4,4 @@ .pull-right= issues.size %ul{ class: "well-list issues-sortable-list", id: "issues-list-#{id}", "data-state" => id } - issues.sort_by(&:position).each do |issue| - = render 'shared/milestones/issue', issue: issue + = render 'shared/milestones/issue', issue: issue, show_project_name: show_project_name, show_full_project_name: show_full_project_name diff --git a/app/views/shared/milestones/_issues_tab.html.haml b/app/views/shared/milestones/_issues_tab.html.haml index 3e98a809ad5..277cd81677b 100644 --- a/app/views/shared/milestones/_issues_tab.html.haml +++ b/app/views/shared/milestones/_issues_tab.html.haml @@ -1,7 +1,10 @@ +- args = { show_project_name: local_assigns.fetch(:show_project_name, false), + show_full_project_name: local_assigns.fetch(:show_full_project_name, false) } + .row.prepend-top-default .col-md-4 - = render('shared/milestones/issues', title: 'Unstarted Issues (open and unassigned)', issues: unassigned, id: 'unassigned') + = render 'shared/milestones/issues', args.merge({ title: 'Unstarted Issues (open and unassigned)', issues: unassigned, id: 'unassigned' }) .col-md-4 - = render('shared/milestones/issues', title: 'Ongoing Issues (open and assigned)', issues: assigned, id: 'ongoing') + = render 'shared/milestones/issues', args.merge({ title: 'Ongoing Issues (open and assigned)', issues: assigned, id: 'ongoing' }) .col-md-4 - = render('shared/milestones/issues', title: 'Completed Issues (closed)', issues: closed, id: 'closed') + = render 'shared/milestones/issues', args.merge({ title: 'Completed Issues (closed)', issues: closed, id: 'closed' }) |