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

app/controllers/admin_controller.rb +9 -5

                 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

app/helpers/admin_helper.rb +1 -1

             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

             <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;

test/functional/admin_controller_test.rb +19 0

@@ -45,6 +45,25 class AdminControllerTest < Test::Unit::TestCase
45	:attributes => { :class => /nodata/ }	45	:attributes => { :class => /nodata/ }
46	end	46	end
47		47
		48	def test_projects
		49	get :projects
		50	assert_response :success
		51	assert_template 'projects'
		52	assert_not_nil assigns(:projects)
		53	# active projects only
		54	assert_nil assigns(:projects).detect {\|u\| !u.active?}
		55	end
		56
		57	def test_projects_with_name_filter
		58	get :projects, :name => 'store', :status => ''
		59	assert_response :success
		60	assert_template 'projects'
		61	projects = assigns(:projects)
		62	assert_not_nil projects
		63	assert_equal 1, projects.size
		64	assert_equal 'OnlineStore', projects.first.name
		65	end
		66
48	def test_load_default_configuration_data	67	def test_load_default_configuration_data
49	delete_configuration_data	68	delete_configuration_data
50	post :default_configuration, :lang => 'fr'	69	post :default_configuration, :lang => 'fr'

General Comments 0

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

No TODOs yet

	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