Merge pull request #100 from chitsaou/fix-password

修正修改密碼、重設密碼的功能
rubytaiwan · Feb 23, 2012 · a9fe9cf · a9fe9cf
2 parents c54cb88 + 4be0e52
commit a9fe9cf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/app/views/account/edit.html.erb b/app/views/account/edit.html.erb
@@ -93,7 +93,6 @@
           <% if params[:by] == "pwd" %>
             <%= render "shared/error_messages", :target => resource %>
           <% end %>
-          <input type="hidden" name="user[:by]" value="pwd" />
           <div class="clearfix">
           <%= f.label :current_password %>
           <div class="input">

diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb
@@ -1,8 +1,12 @@
 <p>Hello <%= @resource.email %>!</p>
 
-<p>Someone has requested a link to change your password, and you can do this through the link below.</p>
+<p>Someone has requested a link to reset your password, and you can do this through the link below.</p>
 
-<p><%= link_to("Change my password", "#{Setting.domain}#{edit_password_path(@resource, :reset_password_token => @resource.reset_password_token)}") %></p>
+<p><%= link_to("Reset my password", edit_password_url(@resource, :reset_password_token => @resource.reset_password_token)) %></p>
+
+<p>If your mail reader prevents you from clicking the link, copy the URL below, paste it on the address bar, and hit Enter.</p>
+
+<p><%= edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %></p>
 
 <p>If you didn't request this, please ignore this email.</p>
 <p>Your password won't change until you access the link above and create a new one.</p>