Fix #378 by duplicating the current form and splitting into two actions.
Daniel O'Connor
1 измененных файлов с 24 добавлено и 7 удалено
+ 24
- 7
app/views/devise/registrations/edit.html.erb
@@ -23,20 +23,23 @@ |
||
| 23 | 23 |
</div> |
| 24 | 24 |
|
| 25 | 25 |
<div class="form-group"> |
| 26 |
- <%= f.label :password, :class => 'col-md-4 control-label' %> |
|
| 26 |
+ <%= f.label :current_password, :class => 'col-md-4 control-label' %> |
|
| 27 | 27 |
<div class="col-md-6"> |
| 28 |
- <%= f.password_field :password, :autocomplete => "off", :class => 'form-control' %> |
|
| 29 |
- <span class="help-inline">Leave blank if you don't want to change it.</span> |
|
| 28 |
+ <%= f.password_field :current_password, :class => 'form-control' %> |
|
| 29 |
+ <span class='help-inline'>We need your current password to confirm your changes.</span> |
|
| 30 | 30 |
</div> |
| 31 | 31 |
</div> |
| 32 |
- |
|
| 32 |
+ |
|
| 33 | 33 |
<div class="form-group"> |
| 34 |
- <%= f.label :password_confirmation, :class => 'col-md-4 control-label' %> |
|
| 35 |
- <div class="col-md-6"> |
|
| 36 |
- <%= f.password_field :password_confirmation, :class => 'form-control' %> |
|
| 34 |
+ <div class="col-md-offset-4 col-md-10"> |
|
| 35 |
+ <%= f.submit "Update", :class => "btn btn-primary" %> |
|
| 37 | 36 |
</div> |
| 38 | 37 |
</div> |
| 38 |
+ <% end %> |
|
| 39 | 39 |
|
| 40 |
+ <h3>Change password</h3> |
|
| 41 |
+ <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put, :class => 'form-horizontal' }) do |f| %>
|
|
| 42 |
+ <%= devise_error_messages! %> |
|
| 40 | 43 |
<div class="form-group"> |
| 41 | 44 |
<%= f.label :current_password, :class => 'col-md-4 control-label' %> |
| 42 | 45 |
<div class="col-md-6"> |
@@ -46,6 +49,20 @@ |
||
| 46 | 49 |
</div> |
| 47 | 50 |
|
| 48 | 51 |
<div class="form-group"> |
| 52 |
+ <%= f.label :password, :class => 'col-md-4 control-label' %> |
|
| 53 |
+ <div class="col-md-6"> |
|
| 54 |
+ <%= f.password_field :password, :autocomplete => "off", :class => 'form-control' %> |
|
| 55 |
+ </div> |
|
| 56 |
+ </div> |
|
| 57 |
+ |
|
| 58 |
+ <div class="form-group"> |
|
| 59 |
+ <%= f.label :password_confirmation, :class => 'col-md-4 control-label' %> |
|
| 60 |
+ <div class="col-md-6"> |
|
| 61 |
+ <%= f.password_field :password_confirmation, :class => 'form-control' %> |
|
| 62 |
+ </div> |
|
| 63 |
+ </div> |
|
| 64 |
+ |
|
| 65 |
+ <div class="form-group"> |
|
| 49 | 66 |
<div class="col-md-offset-4 col-md-10"> |
| 50 | 67 |
<%= f.submit "Update", :class => "btn btn-primary" %> |
| 51 | 68 |
</div> |