diff --git a/workflow/engine/methods/users/users_Edit.php b/workflow/engine/methods/users/users_Edit.php index 19274e49e..a16f89215 100755 --- a/workflow/engine/methods/users/users_Edit.php +++ b/workflow/engine/methods/users/users_Edit.php @@ -32,7 +32,7 @@ try { G::LoadClass('xmlfield_Image'); } require_once 'classes/model/Users.php'; - require_once 'classes/model/Department.php'; + require_once 'classes/model/Department.php'; $_SESSION['CURRENT_USER'] = $_GET['USR_UID']; $oUser = new Users(); @@ -144,17 +144,18 @@ try { global $_DBArray; $_DBArray['aUserInfo'] = $aUserInfo; $_SESSION['_DBArray'] = $_DBArray; - - //always show this form users_EditRT.xml. - $G_PUBLISH->AddContent('xmlform', 'xmlform', 'users/users_EditRT.xml', '', $aFields, 'users_Save?USR_UID=' . $_SESSION['CURRENT_USER']); - //if (isset($aFields['DEP_UID']) && isset($aFields['USR_REPORTS_TO']) && $aFields['DEP_UID']!='' && $aFields['USR_REPORTS_TO']!='') - // $G_PUBLISH->AddContent('xmlform', 'xmlform', 'users/users_EditRT.xml', '', $aFields, 'users_Save?USR_UID=' . $_SESSION['CURRENT_USER']); - //else - // $G_PUBLISH->AddContent('xmlform', 'xmlform', 'users/users_Edit.xml', '', $aFields, 'users_Save?USR_UID=' . $_SESSION['CURRENT_USER']); - + if ($_GET['USR_AUTH_SOURCE'] == 'ProcessMaker (MYSQL)') { + //always show this form users_EditRT.xml. + $G_PUBLISH->AddContent('xmlform', 'xmlform', 'users/users_EditRT.xml', '', $aFields, 'users_Save?USR_UID=' . $_SESSION['CURRENT_USER']); + } + else { + //for users ldap always show this form users_EditLDAP.xml. + $G_PUBLISH->AddContent('xmlform', 'xmlform', 'users/users_EditLDAP.xml', '', $aFields, 'users_Save?USR_UID=' . $_SESSION['CURRENT_USER']); + } + G::RenderPage('publish','blank'); } catch (Exception $oException) { die($oException->getMessage()); } -?> \ No newline at end of file +?> diff --git a/workflow/engine/templates/users/usersList.js b/workflow/engine/templates/users/usersList.js index b89169305..5e14ebeff 100755 --- a/workflow/engine/templates/users/usersList.js +++ b/workflow/engine/templates/users/usersList.js @@ -414,8 +414,8 @@ SummaryTabOpen = function(){ //Edit User Action EditUserAction = function(){ var uid = infoGrid.getSelectionModel().getSelected(); - if (uid){ - location.href = 'users_Edit?USR_UID=' + uid.data.USR_UID; + if (uid) { + location.href = 'users_Edit?USR_UID=' + uid.data.USR_UID+'&USR_AUTH_SOURCE=' + uid.data.USR_AUTH_SOURCE; } }; diff --git a/workflow/engine/xmlform/users/users_EditLDAP.html b/workflow/engine/xmlform/users/users_EditLDAP.html new file mode 100644 index 000000000..ba1c6e942 --- /dev/null +++ b/workflow/engine/xmlform/users/users_EditLDAP.html @@ -0,0 +1,157 @@ +
+ diff --git a/workflow/engine/xmlform/users/users_EditLDAP.xml b/workflow/engine/xmlform/users/users_EditLDAP.xml new file mode 100644 index 000000000..75d36fbd7 --- /dev/null +++ b/workflow/engine/xmlform/users/users_EditLDAP.xml @@ -0,0 +1,256 @@ + +