summaryrefslogtreecommitdiff
path: root/app/views/shared
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2017-06-29 11:43:47 +0100
committerNick Thomas <nick@gitlab.com>2017-06-29 22:38:29 +0100
commitdfcf1b5a44a544ed4b253d88dffac0d35c576211 (patch)
treea000966e4a38ec32e08a2ba81fbf7b68d8966b1a /app/views/shared
parentdba763322c13b31b6ffe1410a031e40ad1b13365 (diff)
downloadgitlab-ce-dfcf1b5a44a544ed4b253d88dffac0d35c576211.tar.gz
Backport changes to Projects::IssuesController and the search bar
Diffstat (limited to 'app/views/shared')
-rw-r--r--app/views/shared/_sort_dropdown.html.haml4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/shared/_sort_dropdown.html.haml b/app/views/shared/_sort_dropdown.html.haml
index a212c714826..785a500e44e 100644
--- a/app/views/shared/_sort_dropdown.html.haml
+++ b/app/views/shared/_sort_dropdown.html.haml
@@ -1,3 +1,5 @@
+- viewing_issues = controller.controller_name == 'issues' || controller.action_name == 'issues'
+
.dropdown.inline.prepend-left-10
%button.dropdown-toggle{ type: 'button', data: {toggle: 'dropdown' } }
- if @sort.present?
@@ -23,7 +25,7 @@
= sort_title_milestone_soon
= link_to page_filter_path(sort: sort_value_milestone_later, label: true) do
= sort_title_milestone_later
- - if controller.controller_name == 'issues' || controller.action_name == 'issues'
+ - if viewing_issues
= link_to page_filter_path(sort: sort_value_due_date_soon, label: true) do
= sort_title_due_date_soon
= link_to page_filter_path(sort: sort_value_due_date_later, label: true) do