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

Merged in bugfix/PMCORE-561-A (pull request #7529)

Browse Source 
PMCORE-561-A

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Andrea Adamczyk
2020-10-20 01:21:20 +00:00
committed by Julio Cesar Laura Avendaño
parent 64a63dcf10 b3f22bc334
commit 05c99db5c1
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/unit/workflow/engine/src/ProcessMaker/Model/ProcessTest.php
View File

@@ -213,9 +213,9 @@ class ProcessTest extends TestCase
} }
/** /**
* It tests the convertPrivateProcessesToPublic method * It tests the convertPrivateProcessesToPublicAndUpdateUser method
* *
* @covers \ProcessMaker\Model\Process::convertPrivateProcessesToPublic() * @covers \ProcessMaker\Model\Process::convertPrivateProcessesToPublicAndUpdateUser()
* @test * @test
*/ */
public function it_should_test_the_convert_private_processes_to_public_method() public function it_should_test_the_convert_private_processes_to_public_method()
@@ -234,8 +234,8 @@ class ProcessTest extends TestCase
//Create a Process object //Create a Process object
$process = new Process(); $process = new Process();
//Call the convertPrivateProcessesToPublic() method //Call the convertPrivateProcessesToPublicAndUpdateUser() method
$process->convertPrivateProcessesToPublic($p); $process->convertPrivateProcessesToPublicAndUpdateUser($p, $pro->PRO_CREATE_USER);
$p = Process::where('PRO_UID', $pro->PRO_UID)->get()->values(); $p = Process::where('PRO_UID', $pro->PRO_UID)->get()->values();

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

@@ -117,8 +117,8 @@ try {
echo $response; echo $response;
break; break;
case 'deleteUser': case 'deleteUser':
Process::convertPrivateProcessesToPublic(json_decode($_POST['private_processes']));
$usrUid = $_POST['USR_UID']; $usrUid = $_POST['USR_UID'];
Process::convertPrivateProcessesToPublicAndUpdateUser(json_decode($_POST['private_processes']), $usrUid);
//Check if the user was defined in a process permissions //Check if the user was defined in a process permissions
$oObjectPermission = new ObjectPermission(); $oObjectPermission = new ObjectPermission();
$aProcess = $oObjectPermission->objectPermissionPerUser($usrUid, 1); $aProcess = $oObjectPermission->objectPermissionPerUser($usrUid, 1);

7
workflow/engine/src/ProcessMaker/Model/Process.php
View File

@@ -82,12 +82,15 @@ class Process extends Model
* @param array $privateProcesses * @param array $privateProcesses
* @return void * @return void
*/ */
public static function convertPrivateProcessesToPublic($privateProcesses) public static function convertPrivateProcessesToPublicAndUpdateUser($privateProcesses, $userUid)
{ {
$admin = RBAC::ADMIN_USER_UID; $admin = RBAC::ADMIN_USER_UID;
$processes = array_column($privateProcesses, 'PRO_ID'); $processes = array_column($privateProcesses, 'PRO_ID');
Process::whereIn('PRO_ID', $processes) Process::whereIn('PRO_ID', $processes)
->update(['PRO_TYPE_PROCESS' => 'PUBLIC', 'PRO_CREATE_USER' => $admin]); ->update(['PRO_TYPE_PROCESS' => 'PUBLIC']);
Process::where('PRO_CREATE_USER', $userUid)
->update(['PRO_CREATE_USER' => $admin]);
} }
} }