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 | |
| parent | 3582861cbcb3e4c80822408c6c31d0de48720813 (diff) | |
| download | gitlab-ce-9a1feb65cc1e947e16dc29308fbc02a1deee56f5.tar.gz | |
Fixed labels & milestones loading the wrong path
| -rw-r--r-- | app/helpers/dropdowns_helper.rb | 6 | ||||
| -rw-r--r-- | app/helpers/labels_helper.rb | 3 | ||||
| -rw-r--r-- | app/helpers/milestones_helper.rb | 3 | ||||
| -rw-r--r-- | app/views/shared/issuable/_label_dropdown.html.haml | 2 |
4 files changed, 10 insertions, 4 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') diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb index 5e9f5837101..5acfae753b9 100644 --- a/app/helpers/labels_helper.rb +++ b/app/helpers/labels_helper.rb @@ -115,8 +115,9 @@ module LabelsHelper end def labels_filter_path + project = @target_project || @project if @project - namespace_project_labels_path(@project.namespace, @project, :json) + namespace_project_labels_path(project.namespace, project, :json) else dashboard_labels_path(:json) end diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb index b3e6e468ecd..6ea83e5dc03 100644 --- a/app/helpers/milestones_helper.rb +++ b/app/helpers/milestones_helper.rb @@ -47,8 +47,9 @@ module MilestonesHelper end def milestones_filter_dropdown_path + project = @target_project || @project if @project - namespace_project_milestones_path(@project.namespace, @project, :json) + namespace_project_milestones_path(project.namespace, project, :json) else dashboard_milestones_path(:json) end diff --git a/app/views/shared/issuable/_label_dropdown.html.haml b/app/views/shared/issuable/_label_dropdown.html.haml index 36a1ac7664e..6518f448253 100644 --- a/app/views/shared/issuable/_label_dropdown.html.haml +++ b/app/views/shared/issuable/_label_dropdown.html.haml @@ -14,7 +14,7 @@ - if selected.present? - if selected.respond_to?('any?') - - selected = project.labels.find_by_id(selected) || selected + - selected = project.labels.where(id: selected) || selected - selected.each do |label| - id = label.try(:id) || label - title = label.try(:title) || label |