fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in feature/HOR-4093 (pull request #6188)

Browse Source 
feature/HOR-4093

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
Approved-by: David Callizaya <david.callizaya@processmaker.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2017-11-16 22:19:37 +00:00
committed by Julio Cesar Laura Avendaño
parent cc2a1c5096 2ab37b9241
commit e8cfefb062
3 changed files with 140 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@@ -42,7 +42,8 @@
"phpmailer/phpmailer": "5.2.*",
"pear/archive_tar": "1.4.*",
"pear/console_getopt": "1.4.*",
"TYPO3/class-alias-loader": "^1.0"
"TYPO3/class-alias-loader": "^1.0",
"ralouphie/getallheaders": "^2.0"
},
"require-dev": {
"guzzle/guzzle": "~3.1.1",

233
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

2
workflow/engine/src/ProcessMaker/BusinessModel/User.php
View File

@@ -807,7 +807,7 @@ class User
}
//Update in rbac
$rbac->load($userUid);
$rbac->userObj = new RbacUsers();
if (isset($arrayData["USR_ROLE"])) {
$rbac->updateUser($arrayData, $arrayData["USR_ROLE"]);
} else {