fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 0000 Changes in new and edit user SOLVED

Browse Source 
- Also changes suggested by julio cesar
This commit is contained in:
Alvaro Campos
2012-06-20 19:00:41 -04:00
parent f289ad4ed4
commit e230492bf9
6 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
workflow/engine/classes/class.system.php
View File

@@ -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';
}
}

2
workflow/engine/methods/users/usersAjax.php
View File

@@ -556,7 +556,7 @@ switch($_POST['action'])
} else {
$color = 'green';
$img = '/images/dialog-ok-apply.png';
$aFields['DESCRIPTION'] .= G::LoadTranslation('ID_PASSWORD_COMPLIES_POLICIES') . '</span>';
$aFields['DESCRIPTION'] = G::LoadTranslation('ID_PASSWORD_COMPLIES_POLICIES') . '</span>';
$aFields['STATUS'] = true;
}
$span = '<span style="color: ' . $color . '; font: 9px tahoma,arial,helvetica,sans-serif;">';

3
workflow/engine/methods/users/usersEdit.php
View File

@@ -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');

1
workflow/engine/methods/users/usersNew.php
View File

@@ -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');

5
workflow/engine/templates/users/users.js
View File

@@ -32,7 +32,10 @@ Ext.onReady(function() {
}
});
if (MODE == 'edit')
flagPoliciesPassword = true;
//EDIT MODE
if (USR_UID != '') {
allowBlackStatus = true;

4
workflow/engine/templates/users/usersList.js
View File

@@ -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';
}
};