diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml index 1d4d6a13c2bb33efa7c780e02d307623e95b81e2..7996c317548a5a597a5bb3fc910c6c92c13027e2 100644 --- a/app/views/issues/show.html.haml +++ b/app/views/issues/show.html.haml @@ -6,6 +6,10 @@ = @issue.created_at.stamp("Aug 21, 2011") %span.right + - if can? current_user, :write_issue, @project + = link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "btn grouped" do + %i.icon-plus + New Issue - if can?(current_user, :admin_project, @project) || @issue.author == current_user - if @issue.closed = link_to 'Reopen', project_issue_path(@project, @issue, issue: {closed: false }, status_only: true), method: :put, class: "btn grouped reopen_issue" diff --git a/app/views/notes/_common_form.html.haml b/app/views/notes/_common_form.html.haml index d76be75bc273a43ef7b90d104b3213845c3c62e6..ae5d72504218c57f24c1be0a8ff7fa5295d2cd3a 100644 --- a/app/views/notes/_common_form.html.haml +++ b/app/views/notes/_common_form.html.haml @@ -22,12 +22,12 @@ .span4.notify_opts %h6.left Notify via email: = label_tag :notify do - = check_box_tag :notify, 1, @note.noteable_type != "Commit" + = check_box_tag :notify, 1, false %span Project team - if @note.notify_only_author?(current_user) = label_tag :notify_author do - = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit" + = check_box_tag :notify_author, 1 , false %span Commit author .span5.attachments %h6.left Attachment: diff --git a/app/views/notes/_per_line_form.html.haml b/app/views/notes/_per_line_form.html.haml index ff80ad4e0d52d9fd279b70154f6afb29fc9a2413..ce391dccae7d2764bb9d4ad9ab3417c610c7e9d7 100644 --- a/app/views/notes/_per_line_form.html.haml +++ b/app/views/notes/_per_line_form.html.haml @@ -23,12 +23,12 @@ %h6.left Notify via email: .labels = label_tag :notify do - = check_box_tag :notify, 1, @note.noteable_type != "Commit" + = check_box_tag :notify, 1, false %span Project team - if @note.notify_only_author?(current_user) = label_tag :notify_author do - = check_box_tag :notify_author, 1 , @note.noteable_type == "Commit" + = check_box_tag :notify_author, 1 , false %span Commit author :javascript