From 69b5c92e608924684cb2bad07cd56bd33f100bf2 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Tue, 26 Jul 2016 16:19:37 +0800 Subject: [PATCH] Fix duplicated issues partial and two cases need the button: For both having existing issues and having no issues. --- app/views/projects/issues/index.html.haml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml index 3742f61a1f8..6b7c156b5ae 100644 --- a/app/views/projects/issues/index.html.haml +++ b/app/views/projects/issues/index.html.haml @@ -25,6 +25,11 @@ .issues-holder = render "issues" + - if new_issue_email + .issues-footer.text-center + %button.issue-email-modal-btn{ type: "button", data: { toggle: "modal", target: "#issue-email-modal" } } + Email a new issue to this project + = render "issue_by_email", email: new_issue_email - else .blank-state.blank-state-welcome %h2.blank-state-title.blank-state-welcome-title @@ -41,13 +46,8 @@ - if can? current_user, :create_issue, @project = link_to new_namespace_project_issue_path(@project.namespace, @project), class: "btn btn-new", title: "New Issue", id: "new_issue_link" do New Issue - - = render 'shared/issuable/filter', type: :issues - - .issues-holder - = render "issues" - - if new_issue_email - .issues-footer.text-center - %button.issue-email-modal-btn{ type: "button", data: { toggle: "modal", target: "#issue-email-modal" } } - Email a new issue to this project - = render "issue_by_email", email: new_issue_email + - if new_issue_email + .issues-footer.text-center + %button.issue-email-modal-btn{ type: "button", data: { toggle: "modal", target: "#issue-email-modal" } } + Email a new issue to this project + = render "issue_by_email", email: new_issue_email