HOR-4480
This commit is contained in:
@@ -2,40 +2,41 @@
|
||||
|
||||
namespace ProcessMaker\BusinessModel;
|
||||
|
||||
use ProcessMaker\BusinessModel\Lists;
|
||||
use G;
|
||||
use Criteria;
|
||||
use UsersPeer;
|
||||
use AppDelegationPeer;
|
||||
use AppDelayPeer;
|
||||
use ProcessMaker\Core\System;
|
||||
use ProcessMaker\Util\DateTime;
|
||||
use PmLicenseManager;
|
||||
use Bootstrap;
|
||||
use ProcessPeer;
|
||||
use BpmnProjectPeer;
|
||||
use Propel;
|
||||
use ResultSet;
|
||||
use Process;
|
||||
use Cases;
|
||||
use ProcessMaker\BusinessModel\Task as BusinessModelTask;
|
||||
use ProcessMaker\Services\Api\Project\Activity\Step as ActivityStep;
|
||||
use Exception;
|
||||
use AppCacheView;
|
||||
use database;
|
||||
use TaskPeer;
|
||||
use StepPeer;
|
||||
use GulliverBasePeer;
|
||||
use AppDelayPeer;
|
||||
use AppDelegationPeer;
|
||||
use AppDocument;
|
||||
use Users;
|
||||
use ProcessMaker\BusinessModel\User as BusinessModelUser;
|
||||
use ProcessMaker\BusinessModel\Cases as BusinessModelCases;
|
||||
use ProcessMaker\Core\RoutingScreen;
|
||||
use Configurations;
|
||||
use InputDocument;
|
||||
use AppFolder;
|
||||
use Bootstrap;
|
||||
use BpmnProjectPeer;
|
||||
use Cases;
|
||||
use Configurations;
|
||||
use Criteria;
|
||||
use database;
|
||||
use Exception;
|
||||
use G;
|
||||
use GulliverBasePeer;
|
||||
use InputDocument;
|
||||
use PmLicenseManager;
|
||||
use PMmemcached;
|
||||
use Process;
|
||||
use ProcessMaker\BusinessModel\Cases as BusinessModelCases;
|
||||
use ProcessMaker\BusinessModel\Lists;
|
||||
use ProcessMaker\BusinessModel\Task as BusinessModelTask;
|
||||
use ProcessMaker\BusinessModel\User as BusinessModelUser;
|
||||
use ProcessMaker\ChangeLog\ChangeLog;
|
||||
use ProcessMaker\Core\RoutingScreen;
|
||||
use ProcessMaker\Core\System;
|
||||
use ProcessMaker\Services\Api\Project\Activity\Step as ActivityStep;
|
||||
use ProcessMaker\Util\DateTime;
|
||||
use ProcessPeer;
|
||||
use Propel;
|
||||
use RBAC;
|
||||
use ResultSet;
|
||||
use StepPeer;
|
||||
use TaskPeer;
|
||||
use Users;
|
||||
use UsersPeer;
|
||||
|
||||
class Light
|
||||
{
|
||||
@@ -599,6 +600,9 @@ class Light
|
||||
$tasks
|
||||
);
|
||||
|
||||
ChangeLog::getChangeLog()
|
||||
->register();
|
||||
|
||||
$array = json_decode(json_encode($fields), true);
|
||||
$array['message'] = trim(strip_tags($array['message']));
|
||||
if ($array ["status_code"] != 0) {
|
||||
|
||||
820
workflow/engine/src/ProcessMaker/ChangeLog/ChangeLog.php
Normal file
820
workflow/engine/src/ProcessMaker/ChangeLog/ChangeLog.php
Normal file
File diff suppressed because it is too large
Load Diff
@@ -3,6 +3,7 @@ namespace ProcessMaker\Services\OAuth2;
|
||||
|
||||
use Luracast\Restler\iAuthenticate;
|
||||
use Luracast\Restler\RestException;
|
||||
use ProcessMaker\ChangeLog\ChangeLog;
|
||||
use ProcessMaker\Core\System;
|
||||
|
||||
class Server implements iAuthenticate
|
||||
@@ -372,6 +373,19 @@ class Server implements iAuthenticate
|
||||
|
||||
$_SESSION['USR_TIME_ZONE'] = $userTimeZone;
|
||||
}
|
||||
|
||||
ChangeLog::getChangeLog()
|
||||
->setUsrId(is_null($user) ? 0 : $user->getUsrId())
|
||||
->setSkin(SYS_SKIN)
|
||||
->setLanguage(SYS_LANG);
|
||||
|
||||
if ($token['client_id'] === config('oauthClients.mobile.clientId')) {
|
||||
ChangeLog::getChangeLog()
|
||||
->setSourceId(ChangeLog::FromMobile);
|
||||
} else {
|
||||
ChangeLog::getChangeLog()
|
||||
->setSourceId(ChangeLog::FromWeb);
|
||||
}
|
||||
|
||||
return $allowed;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user