From e230492bf9b5661ebac874238f061903e47e9ccc Mon Sep 17 00:00:00 2001 From: Alvaro Campos Date: Wed, 20 Jun 2012 19:00:41 -0400 Subject: [PATCH 1/2] BUG 0000 Changes in new and edit user SOLVED - Also changes suggested by julio cesar --- workflow/engine/classes/class.system.php | 9 +++++---- workflow/engine/methods/users/usersAjax.php | 2 +- workflow/engine/methods/users/usersEdit.php | 3 ++- workflow/engine/methods/users/usersNew.php | 1 + workflow/engine/templates/users/users.js | 5 ++++- workflow/engine/templates/users/usersList.js | 4 ++-- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/workflow/engine/classes/class.system.php b/workflow/engine/classes/class.system.php index 938f947b4..0b530e43e 100755 --- a/workflow/engine/classes/class.system.php +++ b/workflow/engine/classes/class.system.php @@ -1021,12 +1021,13 @@ class System { if (defined('PATH_DB')) { // if we're on a valid workspace env. if (empty($wsName)) { $uriParts = explode('/', getenv("REQUEST_URI")); - - if (substr($uriParts[1], 0, 3 ) == 'sys') { - $wsName = substr($uriParts[1], 3); + + if (isset($uriParts[1])) { + if (substr($uriParts[1], 0, 3 ) == 'sys') { + $wsName = substr($uriParts[1], 3); + } } } - $wsIniFile = PATH_DB . $wsName . PATH_SEP . 'env.ini'; } } diff --git a/workflow/engine/methods/users/usersAjax.php b/workflow/engine/methods/users/usersAjax.php index 4587002f6..3297d7e44 100644 --- a/workflow/engine/methods/users/usersAjax.php +++ b/workflow/engine/methods/users/usersAjax.php @@ -556,7 +556,7 @@ switch($_POST['action']) } else { $color = 'green'; $img = '/images/dialog-ok-apply.png'; - $aFields['DESCRIPTION'] .= G::LoadTranslation('ID_PASSWORD_COMPLIES_POLICIES') . ''; + $aFields['DESCRIPTION'] = G::LoadTranslation('ID_PASSWORD_COMPLIES_POLICIES') . ''; $aFields['STATUS'] = true; } $span = ''; diff --git a/workflow/engine/methods/users/usersEdit.php b/workflow/engine/methods/users/usersEdit.php index e2fcaa8e7..3c701e7b9 100644 --- a/workflow/engine/methods/users/usersEdit.php +++ b/workflow/engine/methods/users/usersEdit.php @@ -14,6 +14,7 @@ if ( $postMaxSize < $uploadMaxSize ) $uploadMaxSize = $postMaxSize; $oHeadPublisher =& headPublisher::getSingleton(); $oHeadPublisher->addExtJsScript('users/users', true ); //adding a javascript file .js -$oHeadPublisher->assign('USR_UID', $_GET['USR_UID']); +$oHeadPublisher->assign('USR_UID', $_GET['USR_UID']); +$oHeadPublisher->assign('MODE', $_GET['MODE']); $oHeadPublisher->assign('MAX_FILES_SIZE', ' (' . $UPLOAD_MAX_SIZE . ') '); G::RenderPage('publish', 'extJs'); diff --git a/workflow/engine/methods/users/usersNew.php b/workflow/engine/methods/users/usersNew.php index f74cf1e3a..039019d90 100644 --- a/workflow/engine/methods/users/usersNew.php +++ b/workflow/engine/methods/users/usersNew.php @@ -16,5 +16,6 @@ if ( $postMaxSize < $uploadMaxSize ) $uploadMaxSize = $postMaxSize; $oHeadPublisher =& headPublisher::getSingleton(); $oHeadPublisher->addExtJsScript('users/users', true ); //adding a javascript file .js $oHeadPublisher->assign('USR_UID', ''); +$oHeadPublisher->assign('MODE', $_GET['MODE']); $oHeadPublisher->assign('MAX_FILES_SIZE', ' (' . $UPLOAD_MAX_SIZE . ') '); G::RenderPage('publish', 'extJs'); diff --git a/workflow/engine/templates/users/users.js b/workflow/engine/templates/users/users.js index 6123e251c..d5efc813d 100644 --- a/workflow/engine/templates/users/users.js +++ b/workflow/engine/templates/users/users.js @@ -32,7 +32,10 @@ Ext.onReady(function() { } }); - + + if (MODE == 'edit') + flagPoliciesPassword = true; + //EDIT MODE if (USR_UID != '') { allowBlackStatus = true; diff --git a/workflow/engine/templates/users/usersList.js b/workflow/engine/templates/users/usersList.js index 6301b62c6..15c9cc70d 100755 --- a/workflow/engine/templates/users/usersList.js +++ b/workflow/engine/templates/users/usersList.js @@ -403,7 +403,7 @@ DoNothing = function(){}; //Open New User Form NewUserAction = function(){ - location.href = 'usersNew'; + location.href = 'usersNew?MODE=new'; }; //Delete User Action @@ -469,7 +469,7 @@ SummaryTabOpen = function(){ EditUserAction = function(){ var uid = infoGrid.getSelectionModel().getSelected(); if (uid) { - location.href = 'usersEdit?USR_UID=' + uid.data.USR_UID+'&USR_AUTH_SOURCE=' + uid.data.USR_AUTH_SOURCE; + location.href = 'usersEdit?USR_UID=' + uid.data.USR_UID+'&USR_AUTH_SOURCE=' + uid.data.USR_AUTH_SOURCE+'&MODE=edit'; } }; From bf8fef47c9b6e26d3d2ed36670c26ed9c7f7edd4 Mon Sep 17 00:00:00 2001 From: Alvaro Campos Date: Thu, 21 Jun 2012 09:44:02 -0400 Subject: [PATCH 2/2] BUG 0000 enable/disable buttons SOLVED - Was added enable/disble for the buttons while running the validation of passwords --- workflow/engine/templates/users/users.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/workflow/engine/templates/users/users.js b/workflow/engine/templates/users/users.js index d5efc813d..930d58cf7 100644 --- a/workflow/engine/templates/users/users.js +++ b/workflow/engine/templates/users/users.js @@ -457,6 +457,8 @@ Ext.onReady(function() { listeners: { blur : function(ob) { + Ext.getCmp('saveB').disable(); + Ext.getCmp('cancelB').disable(); var spanAjax = ''; var imageAjax = ''; var labelAjax = _('ID_PASSWORD_TESTING'); @@ -482,7 +484,9 @@ Ext.onReady(function() { flagPoliciesPassword = false; } - Ext.getCmp('passwordReview').setText(resp.DESCRIPTION, false); + Ext.getCmp('passwordReview').setText(resp.DESCRIPTION, false); + Ext.getCmp('saveB').enable(); + Ext.getCmp('cancelB').enable(); }, failure: function () { Ext.MessageBox.show({ @@ -492,6 +496,8 @@ Ext.onReady(function() { animEl: 'mb9', icon: Ext.MessageBox.ERROR }); + Ext.getCmp('saveB').enable(); + Ext.getCmp('cancelB').enable(); } }); @@ -651,12 +657,14 @@ Ext.onReady(function() { buttons : [ { text : _('ID_SAVE'), + id : 'saveB', handler: saveUser }, { text : _('ID_CANCEL'), + id : 'cancelB', handler : function(){ if (!infoMode) { location.href = 'users_List';