From 95f8019f9df3880f596fe2acf11165f0bf044932 Mon Sep 17 00:00:00 2001 From: Victor Saisa Lopez Date: Thu, 9 Aug 2012 17:09:47 -0400 Subject: [PATCH] BUG 9495 "La edicion del User modifica el Rol" SOLVED - Reverted the changes made in "Users.php" - Solved wrong display of information "Country, State or Region, Location" in "View_Edit_Profile" this in IE, all this in "usersAjax.php" --- workflow/engine/classes/model/Users.php | 6 +++--- workflow/engine/methods/users/usersAjax.php | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/workflow/engine/classes/model/Users.php b/workflow/engine/classes/model/Users.php index d0b7d2316..5d1aa082d 100755 --- a/workflow/engine/classes/model/Users.php +++ b/workflow/engine/classes/model/Users.php @@ -153,9 +153,9 @@ public function userExists($UsrUid) $aFields['USR_LOCATION'] ); - $aFields['USR_COUNTRY_NAME'] = (!empty($aIsoCountry['IC_NAME']))? $aIsoCountry['IC_NAME'] : ''; - $aFields['USR_CITY_NAME'] = (!empty($aIsoSubdivision['IS_NAME']))? $aIsoSubdivision['IS_NAME'] : ''; - $aFields['USR_LOCATION_NAME'] = (!empty($aIsoLocation['IL_NAME']))? $aIsoLocation['IL_NAME'] : ''; + $aFields['USR_COUNTRY_NAME'] = $aIsoCountry['IC_NAME']; + $aFields['USR_CITY_NAME'] = $aIsoSubdivision['IS_NAME']; + $aFields['USR_LOCATION_NAME'] = $aIsoLocation['IL_NAME']; $result = $aFields; diff --git a/workflow/engine/methods/users/usersAjax.php b/workflow/engine/methods/users/usersAjax.php index 2005f3eab..5c6b0f71b 100644 --- a/workflow/engine/methods/users/usersAjax.php +++ b/workflow/engine/methods/users/usersAjax.php @@ -483,6 +483,10 @@ switch($_POST['action']) $aFields['CASES_MENUSELECTED_NAME'] = $casesMenuSelected; + $aFields['USR_COUNTRY_NAME'] = (!empty($aFields['USR_COUNTRY_NAME']))? $aFields['USR_COUNTRY_NAME'] : ''; + $aFields['USR_CITY_NAME'] = (!empty($aFields['USR_CITY_NAME']))? $aFields['USR_CITY_NAME'] : ''; + $aFields['USR_LOCATION_NAME'] = (!empty($aFields['USR_LOCATION_NAME']))? $aFields['USR_LOCATION_NAME'] : ''; + $result->success = true; $result->user = $aFields;