diff options
| -rw-r--r-- | app/controllers/admin_public_body_controller.rb | 8 | ||||
| -rw-r--r-- | app/controllers/admin_request_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/admin_track_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/admin_user_controller.rb | 6 | ||||
| -rw-r--r-- | app/controllers/general_controller.rb | 4 | ||||
| -rw-r--r-- | app/models/user.rb | 4 |
6 files changed, 15 insertions, 15 deletions
diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb index b0cdcac78..0c3b5cb8b 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.15 2008-05-26 12:25:36 francis Exp $ +# $Id: admin_public_body_controller.rb,v 1.16 2008-07-28 17:59:40 francis Exp $ class AdminPublicBodyController < ApplicationController layout "admin" @@ -18,9 +18,9 @@ class AdminPublicBodyController < ApplicationController def list @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] + :conditions => @query.nil? ? nil : ["lower(name) = lower('%'||?||'%') or + lower(short_name) = lower('%'||?||'%') or + lower(request_email) = lower('%'||?||'%')", @query, @query, @query] @public_bodies_by_tag = PublicBody.find_by_tag(@query) end diff --git a/app/controllers/admin_request_controller.rb b/app/controllers/admin_request_controller.rb index adbcdc9e9..dd6f9cf46 100644 --- a/app/controllers/admin_request_controller.rb +++ b/app/controllers/admin_request_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_request_controller.rb,v 1.14 2008-07-08 09:41:04 francis Exp $ +# $Id: admin_request_controller.rb,v 1.15 2008-07-28 17:59:40 francis Exp $ class AdminRequestController < ApplicationController layout "admin" @@ -18,7 +18,7 @@ class AdminRequestController < ApplicationController def list @query = params[:query] @info_requests = InfoRequest.paginate :order => "created_at desc", :page => params[:page], :per_page => 100, - :conditions => @query.nil? ? nil : ["title ilike '%'||?||'%'", @query] + :conditions => @query.nil? ? nil : ["lower(title) = lower('%'||?||'%')", @query] end def show diff --git a/app/controllers/admin_track_controller.rb b/app/controllers/admin_track_controller.rb index af0a6c0e7..b21ff49df 100644 --- a/app/controllers/admin_track_controller.rb +++ b/app/controllers/admin_track_controller.rb @@ -4,7 +4,7 @@ # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: admin_track_controller.rb,v 1.2 2008-05-21 10:51:24 francis Exp $ +# $Id: admin_track_controller.rb,v 1.3 2008-07-28 17:59:40 francis Exp $ class AdminTrackController < ApplicationController layout "admin" @@ -13,7 +13,7 @@ class AdminTrackController < ApplicationController def list @query = params[:query] @admin_tracks = TrackThing.paginate :order => "created_at desc", :page => params[:page], :per_page => 100, - :conditions => @query.nil? ? nil : ["track_query ilike '%'||?||'%'", @query ] + :conditions => @query.nil? ? nil : ["lower(track_query) = lower('%'||?||'%')", @query ] end private diff --git a/app/controllers/admin_user_controller.rb b/app/controllers/admin_user_controller.rb index ddbc781f2..facf518f4 100644 --- a/app/controllers/admin_user_controller.rb +++ b/app/controllers/admin_user_controller.rb @@ -4,7 +4,7 @@ # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: admin_user_controller.rb,v 1.3 2008-04-11 15:53:57 francis Exp $ +# $Id: admin_user_controller.rb,v 1.4 2008-07-28 17:59:40 francis Exp $ class AdminUserController < ApplicationController layout "admin" @@ -18,8 +18,8 @@ class AdminUserController < ApplicationController def list @query = params[:query] @admin_users = User.paginate :order => "name", :page => params[:page], :per_page => 100, - :conditions => @query.nil? ? nil : ["name ilike '%'||?||'%' or - email ilike '%'||?||'%'", @query, @query] + :conditions => @query.nil? ? nil : ["lower(name) = lower('%'||?||'%') or + lower(email) = lower('%'||?||'%')", @query, @query] end def show diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb index 7802b701e..141193c2d 100644 --- a/app/controllers/general_controller.rb +++ b/app/controllers/general_controller.rb @@ -5,7 +5,7 @@ # Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: general_controller.rb,v 1.28 2008-05-21 10:51:24 francis Exp $ +# $Id: general_controller.rb,v 1.29 2008-07-28 17:59:40 francis Exp $ class GeneralController < ApplicationController @@ -99,7 +99,7 @@ class GeneralController < ApplicationController criteria = '%' + query + '%' @public_bodies = PublicBody.find(:all, - :conditions => ["name ilike ? or short_name ilike ?", criteria, criteria], + :conditions => ["lower(name) = lower(?) or short_name = lower(?)", criteria, criteria], :order => 'name', :limit=>10) return @public_bodies end diff --git a/app/models/user.rb b/app/models/user.rb index e903bc09d..515c4e733 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -21,7 +21,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: user.rb,v 1.59 2008-07-17 10:32:01 francis Exp $ +# $Id: user.rb,v 1.60 2008-07-28 17:59:41 francis Exp $ require 'digest/sha1' @@ -94,7 +94,7 @@ class User < ActiveRecord::Base # Case-insensitively find a user from their email def self.find_user_by_email(email) - return self.find(:first, :conditions => [ 'email ilike ?', email ] ) # using ilike for case insensitive + return self.find(:first, :conditions => [ 'lower(email) = lower(?)', email ] ) end # When name is changed, also change the url name |