diff options
| author | Phil Hughes <me@iamphill.com> | 2016-07-16 09:41:55 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-07-20 10:48:02 +0100 |
| commit | 9a1feb65cc1e947e16dc29308fbc02a1deee56f5 (patch) | |
| tree | a8596c7037bada0cc2ddc112ea7b099af271fd20 /app/helpers/dropdowns_helper.rb | |
| parent | 3582861cbcb3e4c80822408c6c31d0de48720813 (diff) | |
| download | gitlab-ce-9a1feb65cc1e947e16dc29308fbc02a1deee56f5.tar.gz | |
Fixed labels & milestones loading the wrong path
Diffstat (limited to 'app/helpers/dropdowns_helper.rb')
| -rw-r--r-- | app/helpers/dropdowns_helper.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/helpers/dropdowns_helper.rb b/app/helpers/dropdowns_helper.rb index cc2a5a7b134..b48b218b6ec 100644 --- a/app/helpers/dropdowns_helper.rb +++ b/app/helpers/dropdowns_helper.rb @@ -40,7 +40,11 @@ module DropdownsHelper end def dropdown_toggle(toggle_text, data_attr, options = {}) - default_label = options[:data][:default_label] + default_label = if options[:data] + options[:data][:default_label] + else + '' + end content_tag(:button, class: "dropdown-menu-toggle #{options[:toggle_class] if options.has_key?(:toggle_class)}", id: (options[:id] if options.has_key?(:id)), type: "button", data: data_attr) do output = content_tag(:span, toggle_text, class: "dropdown-toggle-text #{'is-default' if toggle_text == default_label}") output << icon('chevron-down') |