fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in paulis/processmaker/PM-3817 (pull request #3234)

Browse Source 
PM-3817
This commit is contained in:
Julio Cesar Laura Avendaño
2015-11-25 15:32:58 -04:00
parent 5ec3c483ae d942e7b67c
commit 255c26c502
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/methods/users/users_Ajax.php
View File

@@ -362,10 +362,8 @@ try {
}
if (isset($_POST['auth_dn'])) {
$auth_dn = $_POST['auth_dn'];
} else {
$auth_dn = "";
$aData['USR_AUTH_USER_DN'] = $auth_dn;
}
$aData['USR_AUTH_USER_DN'] = $auth_dn;
$RBAC->updateUser($aData);
G::auditLog("AssignAuthenticationSource", "User Name: ".$aData['USR_USERNAME'].' User ID: ('.$aData['USR_UID'].') assign to '.$aData['USR_AUTH_TYPE']);
echo '{success: true}';

2
workflow/engine/templates/users/usersGroups.js
View File

@@ -553,7 +553,7 @@ LoadAuthForm = function(){
authForm.getForm().findField('usr_uid').setValue(user.data.USR_UID);
authForm.getForm().findField('auth_source').setValue(user.auth.AUTH_SOURCE_NAME);
authForm.getForm().findField('auth_dn').setValue(user.data.USR_AUTH_USER_DN);
if (user.auth.AUTH_SOURCE_NAME=='ProcessMaker'){
if (user.auth.AUTH_SOURCE_NAME=='ProcessMaker (MYSQL)'){
authForm.getForm().findField('auth_dn').disable();
}else{
authForm.getForm().findField('auth_dn').enable();