From d09114e4eda026fd695a758a52cf990b6afc23f4 Mon Sep 17 00:00:00 2001 From: Alfredo Sumaran Date: Thu, 5 May 2016 16:57:35 -0500 Subject: [PATCH] Add show_footer parameter for ability to hide footer --- app/views/shared/issuable/_label_dropdown.html.haml | 1 + app/views/shared/issuable/_label_page_default.html.haml | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/shared/issuable/_label_dropdown.html.haml b/app/views/shared/issuable/_label_dropdown.html.haml index 5e25d838666..bf6fac34300 100644 --- a/app/views/shared/issuable/_label_dropdown.html.haml +++ b/app/views/shared/issuable/_label_dropdown.html.haml @@ -20,5 +20,6 @@ .dropdown-menu.dropdown-select.dropdown-menu-paging.dropdown-menu-labels.dropdown-menu-selectable = render partial: "shared/issuable/label_page_default", locals: { title: "Filter by label" } - if can? current_user, :admin_label, @project and @project + = render partial: "shared/issuable/label_page_default", locals: { title: "Filter by label", show_footer: show_footer } = render partial: "shared/issuable/label_page_create" = dropdown_loading diff --git a/app/views/shared/issuable/_label_page_default.html.haml b/app/views/shared/issuable/_label_page_default.html.haml index 7f4867417f7..e5be3751d2f 100644 --- a/app/views/shared/issuable/_label_page_default.html.haml +++ b/app/views/shared/issuable/_label_page_default.html.haml @@ -1,10 +1,11 @@ - title = local_assigns.fetch(:title, 'Assign labels') +- show_footer = local_assigns.fetch(:show_footer, true) - filter_placeholder = local_assigns.fetch(:filter_placeholder, 'Search labels') .dropdown-page-one = dropdown_title(title) = dropdown_filter(filter_placeholder) = dropdown_content - - if @project + - if @project and show_footer = dropdown_footer do %ul.dropdown-footer-list - if can? current_user, :admin_label, @project