diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-10-10 18:22:16 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-10-10 18:22:16 +0000 |
| commit | 5b0be0621d2f31db8caf942b43febafe9158bc17 (patch) | |
| tree | 83b4a7718b890839915ffbc1751812676c9eba12 | |
| parent | c99e9edce7fa71ad53cb35e3bac2afe4646d1ebd (diff) | |
| parent | 78de79d779c1eb8b462fd1b5beb9f9e38bfb6f36 (diff) | |
| download | gitlab-ce-5b0be0621d2f31db8caf942b43febafe9158bc17.tar.gz | |
Merge branch 'master' into 'master'
Persist filters when sorting on user admin page
Closes #2806
See merge request !1543
| -rw-r--r-- | app/views/admin/users/index.html.haml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml index e3698ac1c46..97e4bb2fd73 100644 --- a/app/views/admin/users/index.html.haml +++ b/app/views/admin/users/index.html.haml @@ -54,19 +54,19 @@ %b.caret %ul.dropdown-menu %li - = link_to admin_users_path(sort: sort_value_name) do + = link_to admin_users_path(sort: sort_value_name, filter: params[:filter]) do = sort_title_name - = link_to admin_users_path(sort: sort_value_recently_signin) do + = link_to admin_users_path(sort: sort_value_recently_signin, filter: params[:filter]) do = sort_title_recently_signin - = link_to admin_users_path(sort: sort_value_oldest_signin) do + = link_to admin_users_path(sort: sort_value_oldest_signin, filter: params[:filter]) do = sort_title_oldest_signin - = link_to admin_users_path(sort: sort_value_recently_created) do + = link_to admin_users_path(sort: sort_value_recently_created, filter: params[:filter]) do = sort_title_recently_created - = link_to admin_users_path(sort: sort_value_oldest_created) do + = link_to admin_users_path(sort: sort_value_oldest_created, filter: params[:filter]) do = sort_title_oldest_created - = link_to admin_users_path(sort: sort_value_recently_updated) do + = link_to admin_users_path(sort: sort_value_recently_updated, filter: params[:filter]) do = sort_title_recently_updated - = link_to admin_users_path(sort: sort_value_oldest_updated) do + = link_to admin_users_path(sort: sort_value_oldest_updated, filter: params[:filter]) do = sort_title_oldest_updated = link_to 'New User', new_admin_user_path, class: "btn btn-new btn-sm" |