From 2296a937e4c8ed03577136423586c74449e4ca23 Mon Sep 17 00:00:00 2001 From: jennylee Date: Wed, 17 Apr 2013 15:55:01 -0400 Subject: [PATCH] BUG 11272 Processmaker don't have to let edit UserName and Role. Now Processmaker don't let edit UserName and Role since a different Administrator role --- workflow/engine/methods/users/usersEdit.php | 3 +-- workflow/engine/methods/users/usersInit.php | 1 - workflow/engine/templates/users/users.js | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/workflow/engine/methods/users/usersEdit.php b/workflow/engine/methods/users/usersEdit.php index 80985013e..bbfd6b575 100644 --- a/workflow/engine/methods/users/usersEdit.php +++ b/workflow/engine/methods/users/usersEdit.php @@ -1,2 +1 @@ -load( $_SESSION['USER_LOGGED'] ); $mul = substr( $POST_MAX_SIZE, - 1 ); $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1))); $postMaxSize = (int) $POST_MAX_SIZE * $mul; $UPLOAD_MAX_SIZE = ini_get( 'upload_max_filesize' ); $mul = substr( $UPLOAD_MAX_SIZE, - 1 ); $mul = ($mul == 'M' ? 1048576 : ($mul == 'K' ? 1024 : ($mul == 'G' ? 1073741824 : 1))); $uploadMaxSize = (int) $UPLOAD_MAX_SIZE * $mul; 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( 'ROLE', $aFields['USR_ROLE']); $oHeadPublisher->assign( 'MODE', $_GET['MODE'] ); $oHeadPublisher->assign( 'MAX_FILES_SIZE', ' (' . $UPLOAD_MAX_SIZE . ') ' ); G::RenderPage( 'publish', 'extJs' ); \ No newline at end of file +addExtJsScript( 'users/users', true ); //adding a javascript file .js $oHeadPublisher->assign( 'USR_UID', $_GET['USR_UID'] ); $oHeadPublisher->assign( 'MODE', $_GET['MODE'] ); $oHeadPublisher->assign( 'MAX_FILES_SIZE', ' (' . $UPLOAD_MAX_SIZE . ') ' ); G::RenderPage( 'publish', 'extJs' ); \ No newline at end of file diff --git a/workflow/engine/methods/users/usersInit.php b/workflow/engine/methods/users/usersInit.php index a1282e4dd..54aec877d 100644 --- a/workflow/engine/methods/users/usersInit.php +++ b/workflow/engine/methods/users/usersInit.php @@ -30,7 +30,6 @@ $oHeadPublisher = & headPublisher::getSingleton(); $oHeadPublisher->addExtJsScript( 'users/users', true ); //adding a javascript file .js // $oHeadPublisher->addContent('users/users'); //adding a html file .html. $oHeadPublisher->assign( 'USR_UID', $aFields['USR_UID'] ); -$oHeadPublisher->assign( 'ROLE', $aFields['USR_ROLE']); $oHeadPublisher->assign( 'infoMode', true ); $oHeadPublisher->assign( 'EDITPROFILE', 1); $oHeadPublisher->assign( 'canEdit', $canEdit ); diff --git a/workflow/engine/templates/users/users.js b/workflow/engine/templates/users/users.js index b1f0d5a33..38f2f3232 100644 --- a/workflow/engine/templates/users/users.js +++ b/workflow/engine/templates/users/users.js @@ -394,7 +394,6 @@ Ext.onReady(function () { selectOnFocus : true, editable : false, allowBlank : false, - hidden : (typeof(ROLE) != "undefined" && ROLE == "PROCESSMAKER_ADMIN")? false : true, triggerAction : 'all', mode : 'local' }); @@ -423,7 +422,6 @@ Ext.onReady(function () { width : 260, allowBlank : false, hidden : (typeof EDITPROFILE != "undefined" && EDITPROFILE == 1)? true : false, - hidden : (typeof(ROLE) != "undefined" && ROLE == "PROCESSMAKER_ADMIN")? false : true, listeners: { blur : function(ob) {