diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/user_controller.rb | 4 | ||||
| -rw-r--r-- | app/views/user/show.rhtml | 2 | ||||
| -rw-r--r-- | app/views/user/signchange.rhtml | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index ec9f8b71a..61ea74923 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.43 2008-03-21 15:02:55 francis Exp $ +# $Id: user_controller.rb,v 1.44 2008-03-21 15:31:31 francis Exp $ class UserController < ApplicationController # Show page about a set of users with same url name @@ -165,7 +165,7 @@ class UserController < ApplicationController post_redirect = PostRedirect.find_by_token(params[:pretoken]) do_post_redirect post_redirect.uri, post_redirect.post_params else - redirect_to :controller => "general", :action => "frontpage" # XXX should go back to login and where they were! + redirect_to user_url(@user) end end else diff --git a/app/views/user/show.rhtml b/app/views/user/show.rhtml index 6e14fd175..367bf88d4 100644 --- a/app/views/user/show.rhtml +++ b/app/views/user/show.rhtml @@ -16,7 +16,7 @@ <%= link_to "Send message to " + h(@display_user.name), contact_user_url(:id => @display_user.id) %> <% if @is_you %> (just to see how it works) - <br><%= link_to "Change your password", signchange_url + "?pretoken=" + h(params[:token]) %> + <br><%= link_to "Change your password", signchange_url() %> <% else %> <% end %> </p> diff --git a/app/views/user/signchange.rhtml b/app/views/user/signchange.rhtml index 8f6fe663c..032d80945 100644 --- a/app/views/user/signchange.rhtml +++ b/app/views/user/signchange.rhtml @@ -11,6 +11,7 @@ <h1>Change your password</h1> </div> + <p> <label class="form_label" for="user_password">New password:</label> <%= password_field 'user', 'password', { :size => 15 } %> </p> @@ -23,7 +24,7 @@ <div class="form_button"> <%= hidden_field_tag 'submitted_signchange_password', 1 %> <%= hidden_field_tag 'pretoken', params[:pretoken] %> - <%= submit_tag "Update" %> + <%= submit_tag "Change password" %> </div> <% end %> |