diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-10-03 13:36:35 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-10-04 10:24:50 +0200 |
| commit | 9d476b11426ca757114e85343f548ab3ed15beeb (patch) | |
| tree | be1721ea84820546cef6f77836be93777b7ede5c /app/views/shared/boards | |
| parent | 600a10b9d14c0d581efd270a68944957af762a17 (diff) | |
| download | gitlab-ce-9d476b11426ca757114e85343f548ab3ed15beeb.tar.gz | |
Refactor labels_filter_path and labels navdz-labels-subscribe-filter
Refactor labels_filter_path method to be consistent with other similar
methods like search_filter_path, milestones_filter_path etc.
Also move repeating code in labels index page nav into shared partial
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/shared/boards')
| -rw-r--r-- | app/views/shared/boards/_show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/boards/components/sidebar/_labels.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/shared/boards/_show.html.haml b/app/views/shared/boards/_show.html.haml index 28e6fe1b16d..0d2f6bb77d6 100644 --- a/app/views/shared/boards/_show.html.haml +++ b/app/views/shared/boards/_show.html.haml @@ -33,7 +33,7 @@ - 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, + "label-path" => labels_filter_path_with_defaults, "empty-state-svg" => image_path('illustrations/issues.svg'), ":issue-link-base" => "issueLinkBase", ":root-path" => "rootPath", diff --git a/app/views/shared/boards/components/sidebar/_labels.html.haml b/app/views/shared/boards/components/sidebar/_labels.html.haml index 532045f3697..6138914206b 100644 --- a/app/views/shared/boards/components/sidebar/_labels.html.haml +++ b/app/views/shared/boards/components/sidebar/_labels.html.haml @@ -25,7 +25,7 @@ show_no: "true", show_any: "true", project_id: @project&.try(:id), - labels: labels_filter_path(false), + labels: labels_filter_path_with_defaults, namespace_path: @namespace_path, project_path: @project.try(:path) } } %span.dropdown-toggle-text |