diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-12-21 09:10:20 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-12-21 09:10:20 +0000 |
| commit | 0a8fa500f06707ec14a044bdc652aaf0920bf55b (patch) | |
| tree | 23a8cad8281f7d3bf4933f2cd1720be50086632e /app/views/shared | |
| parent | 1e5083511197b8a2d01cc5556a13de27964f7941 (diff) | |
| parent | e7deeddc1b88a2809bd03dbcb876c5d460c297e5 (diff) | |
| download | gitlab-ce-0a8fa500f06707ec14a044bdc652aaf0920bf55b.tar.gz | |
Merge branch '36958-enable-ordering-projects-subgroups-by-name' into 'master'
Enables ordering groups and their children by name in the web interface
Closes #24962 et #36958
See merge request gitlab-org/gitlab-ce!16045
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/groups/_dropdown.html.haml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/shared/groups/_dropdown.html.haml b/app/views/shared/groups/_dropdown.html.haml index 8e6747ca740..1a259b679c7 100644 --- a/app/views/shared/groups/_dropdown.html.haml +++ b/app/views/shared/groups/_dropdown.html.haml @@ -1,3 +1,4 @@ +- options_hash = local_assigns.fetch(:options_hash, groups_sort_options_hash) - show_archive_options = local_assigns.fetch(:show_archive_options, false) - if @sort.present? - default_sort_by = @sort @@ -10,12 +11,12 @@ .dropdown.inline.js-group-filter-dropdown-wrap.append-right-10 %button.dropdown-toggle{ type: 'button', 'data-toggle' => 'dropdown' } %span.dropdown-label - = sort_options_hash[default_sort_by] + = options_hash[default_sort_by] = icon('chevron-down') %ul.dropdown-menu.dropdown-menu-align-right.dropdown-menu-selectable %li.dropdown-header = _("Sort by") - - groups_sort_options_hash.each do |value, title| + - options_hash.each do |value, title| %li.js-filter-sort-order = link_to filter_groups_path(sort: value), class: ("is-active" if default_sort_by == value) do = title |