summaryrefslogtreecommitdiff
path: root/app/helpers/dropdowns_helper.rb
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2018-12-06 17:08:12 +0100
committerYorick Peterse <yorickpeterse@gmail.com>2018-12-06 17:08:12 +0100
commit9cebc1f82780f0075b69a57fb2aaa44a811c1c69 (patch)
tree362997010b0073d5d35f61a74c475b3a6b2ceaca /app/helpers/dropdowns_helper.rb
parentb4146c7000231f4a8c71598dcf905d40ea95ab4e (diff)
downloadgitlab-ce-9cebc1f82780f0075b69a57fb2aaa44a811c1c69.tar.gz
Backport some EE helper changes
This backports some EE changes made to DropdownsHelper and SelectsHelper. These changes can not easily be moved into an EE specific module, as doing so would require reimplementing all modified methods. Since there is no harm in including these changes in CE directly, we just backport them.
Diffstat (limited to 'app/helpers/dropdowns_helper.rb')
-rw-r--r--app/helpers/dropdowns_helper.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/app/helpers/dropdowns_helper.rb b/app/helpers/dropdowns_helper.rb
index 4b6c5b215e8..8d8c62f1291 100644
--- a/app/helpers/dropdowns_helper.rb
+++ b/app/helpers/dropdowns_helper.rb
@@ -11,6 +11,10 @@ module DropdownsHelper
dropdown_output = dropdown_toggle(toggle_text, data_attr, options)
+ if options.key?(:toggle_link)
+ dropdown_output = dropdown_toggle_link(toggle_text, data_attr, options)
+ end
+
dropdown_output << content_tag(:div, class: "dropdown-menu dropdown-select #{options[:dropdown_class] if options.key?(:dropdown_class)}") do
output = []
@@ -49,6 +53,11 @@ module DropdownsHelper
end
end
+ def dropdown_toggle_link(toggle_text, data_attr, options = {})
+ output = content_tag(:a, toggle_text, class: "dropdown-toggle-text #{options[:toggle_class] if options.key?(:toggle_class)}", id: (options[:id] if options.key?(:id)), data: data_attr)
+ output.html_safe
+ end
+
def dropdown_title(title, options: {})
content_tag :div, class: "dropdown-title" do
title_output = []