Merge branch 'master' into 'master'

Persist filters when sorting on user admin page

Closes #2806

See merge request !1543

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"