From 247a6f14db14543773beb1a1e96f2c335800eb82 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Thu, 17 Jan 2013 16:28:52 +0100
Subject: minor fixes to validation workflow

---
 users/app/controllers/users_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'users/app/controllers/users_controller.rb')

diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb
index 79de630..75ae2da 100644
--- a/users/app/controllers/users_controller.rb
+++ b/users/app/controllers/users_controller.rb
@@ -33,9 +33,10 @@ class UsersController < ApplicationController
 
   def update
     @user.attributes = params[:user]
-    @email_alias = @user.email_aliases.last
     if @user.changed? and @user.save
       flash[:notice] = t(:user_updated_successfully)
+    elsif !@user.email_aliases.last.valid?
+      @email_alias = @user.email_aliases.pop
     end
     respond_with @user, :location => edit_user_path(@user, :anchor => @anchor)
   end
-- 
cgit v1.2.3