diff options
| author | Azul <azul@leap.se> | 2012-12-18 02:51:18 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-12-18 02:51:18 +0100 |
| commit | 6393a9d705f181bd7f81270b01448ae93acb96e5 (patch) | |
| tree | 6311bea0c8bb40c5e7f4578d613a3f751031a03a /users | |
| parent | cd0c59ae6177b8b93971735887657314b6888a3c (diff) | |
display errors on email tab properly
still needs a bit of refactoring in the view
Diffstat (limited to 'users')
| -rw-r--r-- | users/app/controllers/users_controller.rb | 4 | ||||
| -rw-r--r-- | users/app/views/users/edit.html.haml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb index feb66c8..8ba6a7b 100644 --- a/users/app/controllers/users_controller.rb +++ b/users/app/controllers/users_controller.rb @@ -34,9 +34,9 @@ class UsersController < ApplicationController if @user.changed? and @user.save flash[:notice] = t(:user_updated_successfully) else - flash[:error] = @user.errors.full_messages + flash.now[:error] = @user.errors.full_messages.to_sentence end - respond_with @user, :location => edit_user_path(@user, :anchor => :email) + respond_with @user.reload, :location => edit_user_path(@user, :anchor => :email) end def destroy diff --git a/users/app/views/users/edit.html.haml b/users/app/views/users/edit.html.haml index a2a0942..8fc2cab 100644 --- a/users/app/views/users/edit.html.haml +++ b/users/app/views/users/edit.html.haml @@ -7,11 +7,11 @@ %a{:href => '#email', 'data-toggle' => 'tab'}Email .tab-content - .tab-pane.active#account + .tab-pane#account{:class => email_settings? ? :inactive : :active} = user_form_with 'login_field', :legend => :change_login = user_form_with 'password_fields', :legend => :change_password = render 'cancel_account' if @user == current_user - .tab-pane#email + .tab-pane#email{:class => email_settings? ? :active : :inactive} = user_form_with 'email_field', :legend => :set_email_address = user_form_with 'email_forward_field', :legend => :forward_email = user_form_with 'email_aliases', :legend => :add_email_alias |