From e58e75aa8860c4c1530ebe7ad1e4bf557fa1e848 Mon Sep 17 00:00:00 2001 From: Valery Sizov Date: Thu, 13 Aug 2015 16:06:17 +0300 Subject: Fix: User search feature in admin area does not respect filters --- CHANGELOG | 1 + app/views/admin/users/index.html.haml | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index bbbee1d929a..fafbd0e819c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -55,6 +55,7 @@ v 7.14.0 (unreleased) - Add dropzone upload progress - Add a label for merged branches on branches page (Florent Baldino) - Detect .mkd and .mkdn files as markdown (Ben Boeckel) + - Fix: User search feature in admin area does not respect filters v 7.13.5 - Satellites reverted diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml index b0d31170704..5e40d95d1c5 100644 --- a/app/views/admin/users/index.html.haml +++ b/app/views/admin/users/index.html.haml @@ -33,6 +33,7 @@ = form_tag admin_users_path, method: :get, class: 'form-inline' do .form-group = search_field_tag :name, params[:name], placeholder: 'Name, email or username', class: 'form-control' + = hidden_field_tag "filter", params[:filter] = button_tag class: 'btn btn-primary' do %i.fa.fa-search %hr -- cgit v1.2.1