fernando/luos
1
0
Fork 0
Code Releases Activity

solved conflict composer.lock, config/app.php, workflow/engine/classes/SpoolRun.php

Browse Source
This commit is contained in:
Ronald Q
2019-07-11 11:03:09 -04:00
parent 1df3032abf d4c81fe47f
commit b634eb35d8
93 changed files with 7346 additions and 2617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/src/ProcessMaker/Services/Api/Light.php
View File

@@ -652,10 +652,11 @@ class Light extends Api
if (preg_match($this->regexNull, $newerThan)) {
return [];
}
$paged = ($start === 0 && $limit === 0) ? false : true;
$dataList['userId'] = $this->getUserId();
$dataList['action'] = 'unassigned';
$dataList['paged'] = false;
$dataList['paged'] = $paged;
$dataList['start'] = $start;
$dataList['limit'] = $limit;
@@ -682,6 +683,9 @@ class Light extends Api
/*----------------------------------********---------------------------------*/
}
/*----------------------------------********---------------------------------*/
if ($paged === true) {
$response = $response['data'];
}
$result = $this->parserDataUnassigned($response);
return DateTime::convertUtcToIso8601($result, $this->arrayFieldIso8601);

2
workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
View File

@@ -409,7 +409,7 @@ class Server implements iAuthenticate
return $this->server;
}
public function getUserId()
public static function getUserId()
{
return self::$userId;
}