[PATCH conductor] BZ 798515 - Render correct error message when deleting user

Matt Wagner matt.wagner at redhat.com
Thu Mar 1 17:53:33 UTC 2012


We were displaying the entirely wrong flash message and passing in the wrong
argument for it, causing an interpolation error.

Resolves https://bugzilla.redhat.com/show_bug.cgi?id=798515
---
 src/app/controllers/users_controller.rb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/app/controllers/users_controller.rb b/src/app/controllers/users_controller.rb
index 493fb4d..93918bc 100644
--- a/src/app/controllers/users_controller.rb
+++ b/src/app/controllers/users_controller.rb
@@ -139,7 +139,7 @@ class UsersController < ApplicationController
     require_privilege(Privilege::MODIFY, User)
     user = User.find(params[:id])
     if user == current_user
-      flash[:warning] = "#{t('users.flash.warning.not_delete', :login => "#{user.login}")}"
+      flash[:warning] = "#{t('users.flash.warning.not_delete_same_user', :login => "#{user.login}")}"
     else
       user.destroy
       flash[:notice] = t"users.flash.notice.deleted"
-- 
1.7.7.6




More information about the aeolus-devel mailing list