aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/controllers/user_controller.rb4
-rw-r--r--app/views/user/show.rhtml (renamed from app/views/user/index.rhtml)0
-rw-r--r--config/routes.rb5
-rw-r--r--todo.txt3
4 files changed, 5 insertions, 7 deletions
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 2bcb0203a..3daab0670 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -4,10 +4,10 @@
# 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.3 2007-10-26 18:00:26 francis Exp $
+# $Id: user_controller.rb,v 1.4 2007-10-30 14:49:08 francis Exp $
class UserController < ApplicationController
- def index
+ def show
@display_users = User.find(:all, :conditions => [ "name = ?", params[:name] ], :order => "created_at desc")
end
diff --git a/app/views/user/index.rhtml b/app/views/user/show.rhtml
index 3e2668d01..3e2668d01 100644
--- a/app/views/user/index.rhtml
+++ b/app/views/user/show.rhtml
diff --git a/config/routes.rb b/config/routes.rb
index 7d4e0c3f0..5c5cc905b 100644
--- a/config/routes.rb
+++ b/config/routes.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: routes.rb,v 1.15 2007-10-16 21:17:15 louise Exp $
+# $Id: routes.rb,v 1.16 2007-10-30 14:49:08 francis Exp $
ActionController::Routing::Routes.draw do |map|
# The priority is based upon order of creation: first created -> highest priority.
@@ -25,7 +25,7 @@ ActionController::Routing::Routes.draw do |map|
user.signin '/signin', :action => 'signin'
user.signup '/signup', :action => 'signup'
user.signout '/signout', :action => 'signout'
- user.show_user "/user/:name", :action => 'index'
+ user.show_user "/user/:name", :action => 'show'
end
map.public_body "/body/:short_name", :controller => 'body', :action => 'show'
@@ -47,6 +47,7 @@ ActionController::Routing::Routes.draw do |map|
# Install the default route as the lowest priority.
# FAI: Turned off for now, as to be honest I don't trust it from a security point of view.
+ # Somebody is bound to leave a method public in a controller that shouldn't be.
#map.connect ':controller/:action/:id.:format'
#map.connect ':controller/:action/:id'
# map.connect '/:controller/:action'
diff --git a/todo.txt b/todo.txt
index 64429e7cf..6e17e67d7 100644
--- a/todo.txt
+++ b/todo.txt
@@ -2,9 +2,6 @@ Send confirmation email
Make it say "dear" as default letter
-Make sure index for every controller shows all, and the /controller/:id URLs go to a show action
-so body/index.rhtml should go? and request/index.rhtml should be show.rhtml?
-
Escape/simplify short name properly in URLs of public bodies
For public bodies whose short names are renamed, make old URL still work and redirect