aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/user_controller.rb
diff options
context:
space:
mode:
authorfrancis <francis>2008-03-12 16:07:13 +0000
committerfrancis <francis>2008-03-12 16:07:13 +0000
commit938306b88df6c6734566ea7995bf92da9862efc4 (patch)
treefb33992562f3f1cff0f83e00207d7472b844f074 /app/controllers/user_controller.rb
parentfacda1bfffb9d91da6a2f2e22b2345590e452f96 (diff)
Make users all have their own URL, rather than sharing if they have the same name.
Diffstat (limited to 'app/controllers/user_controller.rb')
-rw-r--r--app/controllers/user_controller.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 7be9fa963..2dab3c522 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_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: user_controller.rb,v 1.36 2008-03-12 13:01:04 francis Exp $
+# $Id: user_controller.rb,v 1.37 2008-03-12 16:07:13 francis Exp $
class UserController < ApplicationController
# Show page about a set of users with same url name
@@ -14,7 +14,8 @@ class UserController < ApplicationController
return
end
- @display_users = User.find(:all, :conditions => [ "url_name = ? and email_confirmed", params[:url_name] ], :order => "created_at desc")
+ @display_user = User.find(:first, :conditions => [ "url_name = ? and email_confirmed", params[:url_name] ])
+ @same_name_users = User.find(:all, :conditions => [ "name = ? and email_confirmed and id <> ?", @display_user.name, @display_user.id ], :order => "created_at")
end
# Login form