diff options
| author | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2011-12-08 15:05:01 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2011-12-08 15:05:01 +0200 |
| commit | 8e0126e9ec676f1ec40bb1a3dcb811e6477fb8c6 (patch) | |
| tree | 184a51bc00567f5502a03285c000aa8a26cdd7b2 /app/views/issues/_show.html.haml | |
| parent | 2677bc3acb64a2e3a75a743bd9b5426c39decdef (diff) | |
| parent | 2b896ea6cc7f125a6a86295f23df165d7ebe4259 (diff) | |
| download | gitlab-ce-8e0126e9ec676f1ec40bb1a3dcb811e6477fb8c6.tar.gz | |
Merge branch 'issue_dashboard' into improved_dashboard
Diffstat (limited to 'app/views/issues/_show.html.haml')
| -rw-r--r-- | app/views/issues/_show.html.haml | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml index ecb0afd1659..a68659d544f 100644 --- a/app/views/issues/_show.html.haml +++ b/app/views/issues/_show.html.haml @@ -1,4 +1,4 @@ -%tr{ :id => dom_id(issue), :class => "issue #{issue.critical ? "critical" : ""}", :url => project_issue_path(@project, issue) } +%tr{ :id => dom_id(issue), :class => "issue #{issue.critical ? "critical" : ""}", :url => project_issue_path(issue.project, issue) } %td %strong.issue-number{:class => sort_class}= "##{issue.id}" %span @@ -6,6 +6,9 @@ %br %br %div.note-author + - if not @project.present? + %strong= issue.project.name + = '-' %strong= issue.assignee.name %cite.cgray = time_ago_in_words(issue.created_at) @@ -17,10 +20,10 @@ .right.action-links - if can? current_user, :write_issue, issue - if issue.closed - = link_to 'Reopen', project_issue_path(@project, issue, :issue => {:closed => false }, :status_only => true), :method => :put, :class => "cgray", :remote => true + = link_to 'Reopen', project_issue_path(issue.project, issue, :issue => {:closed => false }, :status_only => true), :method => :put, :class => "cgray", :remote => true - else - = link_to 'Resolve', project_issue_path(@project, issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "cgray", :remote => true + = link_to 'Resolve', project_issue_path(issue.project, issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "cgray", :remote => true - if can? current_user, :write_issue, issue - = link_to 'Edit', edit_project_issue_path(@project, issue), :class => "cgray edit-issue-link", :remote => true + = link_to 'Edit', edit_project_issue_path(issue.project, issue), :class => "cgray edit-issue-link", :remote => true - if can?(current_user, :admin_issue, @project) || issue.author == current_user - = link_to 'Remove', [@project, issue], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-issue negative", :id => "destroy_issue_#{issue.id}" + = link_to 'Remove', [issue.project, issue], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-issue negative", :id => "destroy_issue_#{issue.id}" |