summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Alonso Chavez Armendariz <lchavez@nearsoft.com>2016-11-25 00:29:26 -0700
committerLuis Alonso Chavez Armendariz <lchavez@nearsoft.com>2016-11-25 00:29:26 -0700
commit60cd47bc8ede7411cc2eea7c1fb72dd290eb679a (patch)
tree02284e74eb6413a8ca3a32eb4301f0a83d7ed636
parentfe4ae12ec8bf82f0a6f10508f6650675deefe687 (diff)
downloadgitlab-ce-60cd47bc8ede7411cc2eea7c1fb72dd290eb679a.tar.gz
Fix bad selection on dropdown menu for tags filter
-rw-r--r--app/views/projects/tags/index.html.haml7
-rw-r--r--changelogs/unreleased/issue_24958.yml4
2 files changed, 8 insertions, 3 deletions
diff --git a/app/views/projects/tags/index.html.haml b/app/views/projects/tags/index.html.haml
index 7a0d9dcc94f..b43b13de4ca 100644
--- a/app/views/projects/tags/index.html.haml
+++ b/app/views/projects/tags/index.html.haml
@@ -10,15 +10,16 @@
.nav-controls
= form_tag(filter_tags_path, method: :get) do
= search_field_tag :search, params[:search], { placeholder: 'Filter by tag name', id: 'tag-search', class: 'form-control search-text-input input-short', spellcheck: false }
+
.dropdown.inline
%button.dropdown-toggle.btn{ type: 'button', data: { toggle: 'dropdown'} }
%span.light
- = @sort.humanize
+ = projects_sort_options_hash[@sort]
= icon('caret-down')
%ul.dropdown-menu.dropdown-menu-align-right
%li
- = link_to filter_tags_path(sort: nil) do
- Name
+ = link_to filter_tags_path(sort: sort_value_name) do
+ = sort_title_name
= link_to filter_tags_path(sort: sort_value_recently_updated) do
= sort_title_recently_updated
= link_to filter_tags_path(sort: sort_value_oldest_updated) do
diff --git a/changelogs/unreleased/issue_24958.yml b/changelogs/unreleased/issue_24958.yml
new file mode 100644
index 00000000000..dbbbbf9d28d
--- /dev/null
+++ b/changelogs/unreleased/issue_24958.yml
@@ -0,0 +1,4 @@
+---
+title: Fix bad selection on dropdown menu for tags filter
+merge_request:
+author: Luis Alonso Chavez Armendariz