diff options
| -rw-r--r-- | app/controllers/user_controller.rb | 8 | ||||
| -rw-r--r-- | app/views/user/signin.rhtml (renamed from app/views/user_accounts/signin.rhtml) | 0 | ||||
| -rw-r--r-- | app/views/user/signup.rhtml (renamed from app/views/user_accounts/signup.rhtml) | 0 | ||||
| -rw-r--r-- | todo.txt | 5 |
4 files changed, 5 insertions, 8 deletions
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 2f12c8319..4ca87437e 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.8 2007-11-01 14:45:56 francis Exp $ +# $Id: user_controller.rb,v 1.9 2007-11-01 15:18:54 francis Exp $ class UserController < ApplicationController # XXX See controllers/application.rb simplify_url_part for reverse of expression in SQL below @@ -23,7 +23,7 @@ class UserController < ApplicationController if not params[:user] # First time page is shown - render :template => 'user_accounts/signin' + render :template => 'signin' return else @user = User.authenticate(params[:user][:email], params[:user][:password]) @@ -38,7 +38,7 @@ class UserController < ApplicationController # Failed to authenticate flash[:error] = "Password not correct, please try again" @user = User.new(params[:user]) - render :template => 'user_accounts/signin' + render :template => 'signin' return else # Create a new account @@ -59,7 +59,7 @@ class UserController < ApplicationController @first_time = params[:first_time] @user.errors.clear if @first_time # Show the form - render :template => 'user_accounts/signup' + render :template => 'signup' else # New user made, redirect back to where we were session[:user] = @user.id diff --git a/app/views/user_accounts/signin.rhtml b/app/views/user/signin.rhtml index 137de91b3..137de91b3 100644 --- a/app/views/user_accounts/signin.rhtml +++ b/app/views/user/signin.rhtml diff --git a/app/views/user_accounts/signup.rhtml b/app/views/user/signup.rhtml index dd779a0f3..dd779a0f3 100644 --- a/app/views/user_accounts/signup.rhtml +++ b/app/views/user/signup.rhtml @@ -3,6 +3,7 @@ Online Work out how to do controller/view integrated specs and add some Move things from views/user_accounts into views/user +Replace all find :conditions with find_by_ Next ==== @@ -22,10 +23,6 @@ If you recently made a request, then a login will try to make it again because Write some tests (using rspec) -Migrate to will_paginate from classic_pagination - -Replace all find :conditions with find_by_ - Tidying ======= |