User bio fix
3 gewijzigde bestanden met toevoegingen van 3 en 8 verwijderingen
+ 1
- 1
app/controllers/application_controller.rb
@@ -14,7 +14,7 @@ class ApplicationController < ActionController::Base |
||
| 14 | 14 |
before_filter :analytics |
| 15 | 15 |
|
| 16 | 16 |
def configure_permitted_parameters |
| 17 |
- devise_parameter_sanitizer.for(:account_update) { |u| u.permit(:first_name, :last_name, :email, :current_password, :avatar, :password, :password_confirmation, :avatar_tmp, :avatar_processing) }
|
|
| 17 |
+ devise_parameter_sanitizer.for(:account_update) { |u| u.permit(:first_name, :last_name, :email, :current_password, :avatar, :password, :password_confirmation, :avatar_tmp, :avatar_processing, :bio) }
|
|
| 18 | 18 |
devise_parameter_sanitizer.for(:sign_up) { |u| u.permit(:first_name, :last_name, :email, :password) }
|
| 19 | 19 |
end |
| 20 | 20 |
|
+ 1
- 1
app/controllers/users/registrations_controller.rb
@@ -65,7 +65,7 @@ class Users::RegistrationsController < Devise::RegistrationsController |
||
| 65 | 65 |
@analytics.track('Profile updated')
|
| 66 | 66 |
# Sign in the user bypassing validation in case his password changed |
| 67 | 67 |
sign_in @user, :bypass => true |
| 68 |
- redirect_to after_update_path_for(@user) |
|
| 68 |
+ redirect_to edit_user_registration_path |
|
| 69 | 69 |
else |
| 70 | 70 |
render "edit" |
| 71 | 71 |
end |
+ 1
- 6
app/views/devise/registrations/edit.html.erb
@@ -1,6 +1,5 @@ |
||
| 1 | 1 |
<% title (t 'registration.edit_profile') + ' - ' + @config.website_name %> |
| 2 |
- |
|
| 3 |
- |
|
| 2 |
+<%= render :partial => 'layouts/flash' %> |
|
| 4 | 3 |
|
| 5 | 4 |
|
| 6 | 5 |
|
@@ -8,7 +7,6 @@ |
||
| 8 | 7 |
<%= content_tag(:div, class: 'row') do %> |
| 9 | 8 |
<%= content_tag(:div, class: 'span12') do %> |
| 10 | 9 |
<% # Page Content %> |
| 11 |
- <%= render :partial => 'layouts/flash' %> |
|
| 12 | 10 |
<%= content_tag(:div, class: 'page-header') do %> |
| 13 | 11 |
<%= content_tag(:h1) do %> |
| 14 | 12 |
<%= t 'registration.edit_profile' %> |
@@ -19,17 +17,14 @@ |
||
| 19 | 17 |
|
| 20 | 18 |
|
| 21 | 19 |
<%= bootstrap_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
|
| 22 |
- |
|
| 23 | 20 |
<% # Edit Agent Account %> |
| 24 | 21 |
<%= content_tag(:div, class: 'row') do %> |
| 25 | 22 |
<% # Form - User %> |
| 26 | 23 |
<%= content_tag(:div, class: 'offset2 span8') do %> |
| 27 |
- <%= f.alert_message "Please fix the errors below." %> |
|
| 28 | 24 |
<%= content_tag(:div, class: 'panel panel-default') do %> |
| 29 | 25 |
<div class="panel-body"> |
| 30 | 26 |
<%= content_tag(:div, class: 'panel-content') do %> |
| 31 | 27 |
<%= content_tag(:div, class: 'panel-text') do %> |
| 32 |
- <%= f.alert_message "Please fix the errors below."%> |
|
| 33 | 28 |
<% if devise_mapping.confirmable? && resource.pending_reconfirmation? %> |
| 34 | 29 |
<p>Currently waiting confirmation for: <%= resource.unconfirmed_email %></p> |
| 35 | 30 |
<% end %> |