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

Merged in bugfix/HOR-4070 (pull request #6180)

Browse Source 
HOR-4070

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2017-11-16 12:09:45 +00:00
committed by Julio Cesar Laura Avendaño
parent cb07d0f954 5beb7623b3
commit 38d01672b6
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/IndicatorsCalculator.php
View File

@@ -650,7 +650,7 @@ class IndicatorsCalculator
}
private function pdoConnection() {
$currentWS = !empty(config("system.workspace")) ? config("system.workspace") : 'Wokspace Undefined';
$currentWS = !empty(config("system.workspace")) ? config("system.workspace") : 'Undefined Workspace';
$workSpace = new WorkspaceTools($currentWS);
$arrayHost = explode(':', $workSpace->dbHost);
$host = "host=".$arrayHost[0];

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

@@ -63,7 +63,7 @@ class EmailServer
$currentUser = $RBAC->aUserInfo['USER_INFO'];
$info = array(
'ip' => G::getIpAddress(),
'workspace' => (!empty(config("system.workspace"))) ? config("system.workspace") : "Workspace undefined",
'workspace' => (!empty(config("system.workspace"))) ? config("system.workspace") : "Undefined Workspace",
'usrUid' => $currentUser['USR_UID']
);
$this->setContextLog($info);

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

@@ -1151,7 +1151,7 @@ class TimerEvent
private function log($action, $value = "", $status = "action")
{
try {
$workspace = (!empty(config("system.workspace")))? config("system.workspace") : "Wokspace Undefined";
$workspace = (!empty(config("system.workspace")))? config("system.workspace") : "Undefined Workspace";
$ipClient = \G::getIpAddress();
$actionTimer = "timereventcron: ";

2
workflow/engine/src/ProcessMaker/Project/Bpmn.php
View File

@@ -138,7 +138,7 @@ class Bpmn extends Handler
//Define the variables for the logging
$info = array(
'ip' => G::getIpAddress(),
'workspace' => (!empty(config("system.workspace")))? config("system.workspace") : "Workspace undefined"
'workspace' => (!empty(config("system.workspace")))? config("system.workspace") : "Undefined Workspace"
);
$this->setContextLog($info);
}