summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-09-22 16:11:34 +0000
committerRémy Coutable <remy@rymai.me>2017-09-22 16:11:34 +0000
commit17251d0464e2c5a61c56f45b435fcf5356d4273b (patch)
tree33713a0a5daadee9ca25e02725b1844ae963427d
parenta0eebff87acb3d8d488e928d61de65c150100ef2 (diff)
parentf67c2ead87833ac06f2cf722bda71a79f4fc1428 (diff)
downloadgitlab-ce-17251d0464e2c5a61c56f45b435fcf5356d4273b.tar.gz
Merge branch 'ee-to-ce-2017-09-22' into 'master'
Don't show %board-add-issues-modal if there's no project See merge request gitlab-org/gitlab-ce!14442
-rw-r--r--app/views/shared/boards/_show.html.haml15
1 files changed, 8 insertions, 7 deletions
diff --git a/app/views/shared/boards/_show.html.haml b/app/views/shared/boards/_show.html.haml
index 2e5e7911981..722890a01e5 100644
--- a/app/views/shared/boards/_show.html.haml
+++ b/app/views/shared/boards/_show.html.haml
@@ -31,10 +31,11 @@
":board-id" => "boardId",
":key" => "_uid" }
= render "shared/boards/components/sidebar"
- %board-add-issues-modal{ "new-issue-path" => new_project_issue_path(@project),
- "milestone-path" => milestones_filter_dropdown_path,
- "label-path" => labels_filter_path,
- "empty-state-svg" => image_path('illustrations/issues.svg'),
- ":issue-link-base" => "issueLinkBase",
- ":root-path" => "rootPath",
- ":project-id" => @project.try(:id) }
+ - if @project
+ %board-add-issues-modal{ "new-issue-path" => new_project_issue_path(@project),
+ "milestone-path" => milestones_filter_dropdown_path,
+ "label-path" => labels_filter_path,
+ "empty-state-svg" => image_path('illustrations/issues.svg'),
+ ":issue-link-base" => "issueLinkBase",
+ ":root-path" => "rootPath",
+ ":project-id" => @project.id }