jro_apps/redmine Commit - r1943:d967507dcb20

Adds the ability to search for a user on the administration users list....

Jean-Philippe Lang -

r1943:d967507dcb20

parent child

Context file:

r1943:d967507dcb20

Collapse all files

app/controllers/users_controller.rb +8 -4

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class UsersController < ApplicationController
               before_filter :require_admin
               helper :sort
               include SortHelper
               helper :custom_fields
               include CustomFieldsHelper
               def index
                 list
                 render :action => 'list' unless request.xhr?
               end
               def list
                 sort_init 'login', 'asc'
                 sort_update
                 @status = params[:status] ? params[:status].to_i : 1
-                conditions = "status <> 0"
+                c = ARCondition.new(@status == 0 ? "status <> 0" : ["status = ?", @status])
-                conditions = ["status=?", @status] unless @status == 0
+                unless params[:name].blank?
+                  name = "%#{params[:name].strip.downcase}%"
+                  c << ["LOWER(login) LIKE ? OR LOWER(firstname) LIKE ? OR LOWER(lastname) LIKE ?", name, name, name]
+                end
-                @user_count = User.count(:conditions => conditions)
+                @user_count = User.count(:conditions => c.conditions)
                 @user_pages = Paginator.new self, @user_count,
             								per_page_option,
             								params['page']
                 @users =  User.find :all,:order => sort_clause,
-                                    :conditions => conditions,
+                                    :conditions => c.conditions,
             						:limit  =>  @user_pages.items_per_page,
             						:offset =>  @user_pages.current.offset
                 render :action => "list", :layout => false if request.xhr?
               end
               def add
                 if request.get?
                   @user = User.new(:language => Setting.default_language)
                 else
                   @user = User.new(params[:user])
                   @user.admin = params[:user][:admin] || false
                   @user.login = params[:user][:login]
                   @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless @user.auth_source_id
                   if @user.save
                     Mailer.deliver_account_information(@user, params[:password]) if params[:send_information]
                     flash[:notice] = l(:notice_successful_create)
                     redirect_to :action => 'list'
                   end
                 end
                 @auth_sources = AuthSource.find(:all)
               end
               def edit
                 @user = User.find(params[:id])
                 if request.post?
                   @user.admin = params[:user][:admin] if params[:user][:admin]
                   @user.login = params[:user][:login] if params[:user][:login]
                   @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless params[:password].nil? or params[:password].empty? or @user.auth_source_id
                   if @user.update_attributes(params[:user])
                     flash[:notice] = l(:notice_successful_update)
                     # Give a string to redirect_to otherwise it would use status param as the response code
                     redirect_to(url_for(:action => 'list', :status => params[:status], :page => params[:page]))
                   end
                 end
                 @auth_sources = AuthSource.find(:all)
                 @roles = Role.find_all_givable
                 @projects = Project.find(:all, :order => 'name', :conditions => "status=#{Project::STATUS_ACTIVE}") - @user.projects
                 @membership ||= Member.new
                 @memberships = @user.memberships
               end
               def edit_membership
                 @user = User.find(params[:id])
                 @membership = params[:membership_id] ? Member.find(params[:membership_id]) : Member.new(:user => @user)
                 @membership.attributes = params[:membership]
                 @membership.save if request.post?
                 redirect_to :action => 'edit', :id => @user, :tab => 'memberships'
               end
               def destroy_membership
                 @user = User.find(params[:id])
                 Member.find(params[:membership_id]).destroy if request.post?
                 redirect_to :action => 'edit', :id => @user, :tab => 'memberships'
               end
             end

app/views/users/list.rhtml +4 -1

             <div class="contextual">
             <%= link_to l(:label_user_new), {:action => 'add'}, :class => 'icon icon-add' %>
             </div>
             <h2><%=l(:label_user_plural)%></h2>
             <% form_tag({}, :method => :get) do %>
             <fieldset><legend><%= l(:label_filter_plural) %></legend>
-            <label><%= l(:field_status) %> :</label>
+            <label><%= l(:field_status) %>:</label>
             <%= select_tag 'status', users_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
+            <label><%= l(:label_user) %>:</label>
+            <%= text_field_tag 'name', params[:name], :size => 30 %>
+            <%= submit_tag l(:button_apply), :class => "small", :name => nil %>
             </fieldset>
             <% end %>
             &nbsp;
             <table class="list">
               <thead><tr>
             	<%= sort_header_tag('login', :caption => l(:field_login)) %>
             	<%= sort_header_tag('firstname', :caption => l(:field_firstname)) %>
             	<%= sort_header_tag('lastname', :caption => l(:field_lastname)) %>
             	<%= sort_header_tag('mail', :caption => l(:field_mail)) %>
             	<%= sort_header_tag('admin', :caption => l(:field_admin), :default_order => 'desc') %>
             	<%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %>
             	<%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on), :default_order => 'desc') %>
                 <th></th>
               </tr></thead>
               <tbody>
             <% for user in @users -%>
               <tr class="user <%= cycle("odd", "even") %> <%= %w(anon active registered locked)[user.status] %>">
             	<td class="username"><%= link_to h(user.login), :action => 'edit', :id => user %></td>
             	<td class="firstname"><%= h(user.firstname) %></td>
             	<td class="lastname"><%= h(user.lastname) %></td>
             	<td class="email"><%= mail_to(h(user.mail)) %></td>
             	<td align="center"><%= image_tag('true.png') if user.admin? %></td>
             	<td class="created_on" align="center"><%= format_time(user.created_on) %></td>
             	<td class="last_login_on" align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
                 <td><small><%= change_status_link(user) %></small></td>
               </tr>
             <% end -%>
               </tbody>
             </table>
             <p class="pagination"><%= pagination_links_full @user_pages, @user_count %></p>
             <% html_title(l(:label_user_plural)) -%>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages