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

Merge remote-tracking branch 'upstream/develop' into bugfix/HOR-2887

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2017-05-24 09:04:40 -04:00
parent c35c6db260 f984d334c0
commit 14b5555fc6
521 changed files with 63136 additions and 17249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
workflow/engine/src/ProcessMaker/BusinessModel/MessageType.php
View File

@@ -636,6 +636,7 @@ class MessageType
$criteriaMessageTypeVariable = $variable->getMessageTypeVariableCriteria();
$criteriaMessageTypeVariable->add(\MessageTypeVariablePeer::MSGT_UID, $row["MSGT_UID"], \Criteria::EQUAL);
$criteriaMessageTypeVariable->addAscendingOrderByColumn(\MessageTypeVariablePeer::MSGTV_NAME);
$rsCriteriaMessageTypeVariable = \MessageTypeVariablePeer::doSelectRS($criteriaMessageTypeVariable);
$rsCriteriaMessageTypeVariable->setFetchmode(\ResultSet::FETCHMODE_ASSOC);

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

@@ -1756,9 +1756,9 @@ class TimerEvent
} while ($flagNextRecord);
if (!$flagRecord) {
$common->frontEndShow("TEXT", "Not exists any record to continue a case, on date \"$datetime (UTC +00:00)\"");
$common->frontEndShow("TEXT", "No existing records to continue a case, on date \"$datetime (UTC +00:00)\"");
$this->log("NO-RECORDS", "Not exists any record to continue a case");
$this->log("NO-RECORDS", "No existing records to continue a case");
$aInfo = array(
'ip' => \G::getIpAddress()
,'action' => $action
@@ -1767,7 +1767,7 @@ class TimerEvent
);
$this->syslog(
200
,'Not exists any record to continue a case'
,'No existing records to continue a case'
,'NO-RECORDS'
,$aInfo
);