From 394fec0c138a92dc91c0955eacaa30a9abd990cd Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Thu, 23 Dec 2010 12:34:57 +0000 Subject: [PATCH] 2010-12-23 Miguel de Dios * godmode/groups/group_list.php: fixed error message show in the successful delete group operation. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3697 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 5 +++++ pandora_console/godmode/groups/group_list.php | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 9996978520..74951f770e 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2010-12-23 Miguel de Dios + + * godmode/groups/group_list.php: fixed error message show in the successful + delete group operation. + 2010-12-23 Ramon Novoa * include/javascript/pandora.js: Translate space HTML entities. diff --git a/pandora_console/godmode/groups/group_list.php b/pandora_console/godmode/groups/group_list.php index a18ec0d8ef..3183b8ec68 100644 --- a/pandora_console/godmode/groups/group_list.php +++ b/pandora_console/godmode/groups/group_list.php @@ -162,13 +162,12 @@ if ($delete_group) { echo "

" . sprintf(__('The group is not empty. It is use in %s.'), implode(', ', $usedGroup['tables'])) . "

"; } - - if ((!$result) || (!$usedGroup['return'])) { - echo "

".__('There was a problem deleting group')."

"; + if ($result && (!$usedGroup['return'])) { + echo "

".__('Group successfully deleted')."

"; } else { - echo "

".__('Group successfully deleted')."

"; + echo "

".__('There was a problem deleting group')."

"; } }