jro_apps/redmine Commit - r1945:16eda4c5c91c

Adds the ability to search for a project name or identifier on the administration projects list....

Jean-Philippe Lang -

r1945:16eda4c5c91c

parent child

Context file:

r1945:16eda4c5c91c

Collapse all files

app/controllers/admin_controller.rb +9 -5

             # redMine - project management software
             # Copyright (C) 2006  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 AdminController < ApplicationController
               before_filter :require_admin
               helper :sort
               include SortHelper
               def index
                 @no_configuration_data = Redmine::DefaultData::Loader::no_data?
               end
               def projects
                 sort_init 'name', 'asc'
                 sort_update
-                @status = params[:status] ? params[:status].to_i : 0
+                @status = params[:status] ? params[:status].to_i : 1
-                conditions = nil
+                c = ARCondition.new(@status == 0 ? "status <> 0" : ["status = ?", @status])
-                conditions = ["status=?", @status] unless @status == 0
-                @project_count = Project.count(:conditions => conditions)
+                unless params[:name].blank?
+                  name = "%#{params[:name].strip.downcase}%"
+                  c << ["LOWER(identifier) LIKE ? OR LOWER(name) LIKE ?", name, name]
+                end
+                @project_count = Project.count(:conditions => c.conditions)
                 @project_pages = Paginator.new self, @project_count,
             								per_page_option,
             								params['page']
                 @projects = Project.find :all, :order => sort_clause,
-                                    :conditions => conditions,
+                                    :conditions => c.conditions,
             						:limit  =>  @project_pages.items_per_page,
             						:offset =>  @project_pages.current.offset
                 render :action => "projects", :layout => false if request.xhr?
               end
               # Loads the default configuration
               # (roles, trackers, statuses, workflow, enumerations)
               def default_configuration
                 if request.post?
                   begin
                     Redmine::DefaultData::Loader::load(params[:lang])
                     flash[:notice] = l(:notice_default_data_loaded)
                   rescue Exception => e
                     flash[:error] = l(:error_can_t_load_default_data, e.message)
                   end
                 end
                 redirect_to :action => 'index'
               end
               def test_email
                 raise_delivery_errors = ActionMailer::Base.raise_delivery_errors
                 # Force ActionMailer to raise delivery errors so we can catch it
                 ActionMailer::Base.raise_delivery_errors = true
                 begin
                   @test = Mailer.deliver_test(User.current)
                   flash[:notice] = l(:notice_email_sent, User.current.mail)
                 rescue Exception => e
                   flash[:error] = l(:notice_email_error, e.message)
                 end
                 ActionMailer::Base.raise_delivery_errors = raise_delivery_errors
                 redirect_to :controller => 'settings', :action => 'edit', :tab => 'notifications'
               end
               def info
                 @db_adapter_name = ActiveRecord::Base.connection.adapter_name
                 @flags = {
                   :default_admin_changed => User.find(:first, :conditions => ["login=? and hashed_password=?", 'admin', User.hash_password('admin')]).nil?,
                   :file_repository_writable => File.writable?(Attachment.storage_path),
                   :rmagick_available => Object.const_defined?(:Magick)
                 }
                 @plugins = Redmine::Plugin.registered_plugins
               end
             end

app/helpers/admin_helper.rb +1 -1

             # redMine - project management software
             # Copyright (C) 2006  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.
             module AdminHelper
               def project_status_options_for_select(selected)
-                options_for_select([[l(:label_all), "*"],
+                options_for_select([[l(:label_all), ''],
                                     [l(:status_active), 1]], selected)
               end
             end

app/views/admin/projects.rhtml +4 -2

             <div class="contextual">
             <%= link_to l(:label_project_new), {:controller => 'projects', :action => 'add'}, :class => 'icon icon-add' %>
             </div>
             <h2><%=l(:label_project_plural)%></h2>
-            <% form_tag() do %>
+            <% form_tag({}, :method => :get) do %>
             <fieldset><legend><%= l(:label_filter_plural) %></legend>
             <label><%= l(:field_status) %> :</label>
             <%= select_tag 'status', project_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
-            <%= submit_tag l(:button_apply), :class => "small" %>
+            <label><%= l(:label_project) %>:</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('name', :caption => l(:label_project)) %>
             	<th><%=l(:field_description)%></th>
             	<th><%=l(:label_subproject_plural)%></th>
             	<%= sort_header_tag('is_public', :caption => l(:field_is_public), :default_order => 'desc') %>
             	<%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %>
                 <th></th>
                 <th></th>
               </tr></thead>
               <tbody>
             <% for project in @projects %>
               <tr class="<%= cycle("odd", "even") %>">
             	<td><%= project.active? ? link_to(h(project.name), :controller => 'projects', :action => 'settings', :id => project) : h(project.name) %>
             	<td><%= textilizable project.short_description, :project => project %>
             	<td align="center"><%= project.children.size %>
             	<td align="center"><%= image_tag 'true.png' if project.is_public? %>
             	<td align="center"><%= format_date(project.created_on) %>
               <td align="center" style="width:10%">
                 <small>
                 <%= link_to(l(:button_archive), { :controller => 'projects', :action => 'archive', :id => project }, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-lock') if project.active? %>
                 <%= link_to(l(:button_unarchive), { :controller => 'projects', :action => 'unarchive', :id => project }, :method => :post, :class => 'icon icon-unlock') if !project.active? && (project.parent.nil? || project.parent.active?) %>
                 </small>
               </td>
               <td align="center" style="width:10%">
                 <small><%= link_to(l(:button_delete), { :controller => 'projects', :action => 'destroy', :id => project }, :class => 'icon icon-del') %></small>
               </td>
               </tr>
             <% end %>
               </tbody>
             </table>
             <p class="pagination"><%= pagination_links_full @project_pages, @project_count %></p>
             <% html_title(l(:label_project_plural)) -%>

test/functional/admin_controller_test.rb +19 0

             # 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.
             require File.dirname(__FILE__) + '/../test_helper'
             require 'admin_controller'
             # Re-raise errors caught by the controller.
             class AdminController; def rescue_action(e) raise e end; end
             class AdminControllerTest < Test::Unit::TestCase
               fixtures :projects, :users, :roles
               def setup
                 @controller = AdminController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
                 @request.session[:user_id] = 1 # admin
               end
               def test_index
                 get :index
                 assert_no_tag :tag => 'div',
                               :attributes => { :class => /nodata/ }
               end
               def test_index_with_no_configuration_data
                 delete_configuration_data
                 get :index
                 assert_tag :tag => 'div',
                            :attributes => { :class => /nodata/ }
               end
+              def test_projects
+                get :projects
+                assert_response :success
+                assert_template 'projects'
+                assert_not_nil assigns(:projects)
+                # active projects only
+                assert_nil assigns(:projects).detect {|u| !u.active?}
+              end
+              def test_projects_with_name_filter
+                get :projects, :name => 'store', :status => ''
+                assert_response :success
+                assert_template 'projects'
+                projects = assigns(:projects)
+                assert_not_nil projects
+                assert_equal 1, projects.size
+                assert_equal 'OnlineStore', projects.first.name
+              end
               def test_load_default_configuration_data
                 delete_configuration_data
                 post :default_configuration, :lang => 'fr'
                 assert IssueStatus.find_by_name('Nouveau')
               end
               def test_test_email
                 get :test_email
                 assert_redirected_to 'settings/edit'
                 mail = ActionMailer::Base.deliveries.last
                 assert_kind_of TMail::Mail, mail
                 user = User.find(1)
                 assert_equal [user.mail], mail.bcc
               end
               def test_info
                 get :info
                 assert_response :success
                 assert_template 'info'
               end
               def delete_configuration_data
                 Role.delete_all('builtin = 0')
                 Tracker.delete_all
                 IssueStatus.delete_all
                 Enumeration.delete_all
               end
             end

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