aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrancis <francis>2008-03-14 10:09:55 +0000
committerfrancis <francis>2008-03-14 10:09:55 +0000
commit72a437d93a6bdc172cd0f0326098d016e9a00cb7 (patch)
tree93e24a8621e0fafb4fb33dd2c92039ac44ef9beb
parent9243ba7a823b106b166bca0662e5d9f40b60f881 (diff)
Search public bodies in admin.
-rw-r--r--app/controllers/admin_public_body_controller.rb8
-rw-r--r--app/views/admin_public_body/list.rhtml11
2 files changed, 16 insertions, 3 deletions
diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb
index a43be17ce..39a406e4d 100644
--- a/app/controllers/admin_public_body_controller.rb
+++ b/app/controllers/admin_public_body_controller.rb
@@ -4,7 +4,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: admin_public_body_controller.rb,v 1.8 2008-03-02 23:46:51 francis Exp $
+# $Id: admin_public_body_controller.rb,v 1.9 2008-03-14 10:09:55 francis Exp $
class AdminPublicBodyController < ApplicationController
layout "admin"
@@ -15,7 +15,11 @@ class AdminPublicBodyController < ApplicationController
end
def list
- @public_bodies = PublicBody.paginate :order => "name", :page => params[:page], :per_page => 100
+ @query = params[:query]
+ @public_bodies = PublicBody.paginate :order => "name", :page => params[:page], :per_page => 100,
+ :conditions => @query.nil? ? nil : ["name ilike '%'||?||'%' or
+ short_name ilike '%'||?||'%' or
+ request_email ilike '%'||?||'%'", @query, @query, @query]
end
def show
diff --git a/app/views/admin_public_body/list.rhtml b/app/views/admin_public_body/list.rhtml
index b331b5914..b34ab8ccb 100644
--- a/app/views/admin_public_body/list.rhtml
+++ b/app/views/admin_public_body/list.rhtml
@@ -2,7 +2,16 @@
<h1><%=@title%></h1>
-<p><%= link_to 'New public body', 'new' %></p>
+<p>
+ <%= link_to 'New public body', 'new' %>
+</p>
+
+<p>
+ <% form_tag({}) do %>
+ <%= text_field_tag 'query', params[:query], { :size => 30 } %>
+ <%= submit_tag "Search" %>
+ <% end %>
+</p>
<table>
<tr>