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

BUG 12981 When using the plugin ActionByEmail. The email received is not very user freindly IMPROVEMENT

Browse Source
This commit is contained in:
Julio Cesar Laura
2014-01-22 10:20:51 -04:00
parent f3e7b7234d
commit 73f9b84fc7
2 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
workflow/engine/classes/class.case.php
View File

@@ -3906,12 +3906,12 @@ class Cases
if (AppDelegationPeer::doCount($oCriteria) == 1) { if (AppDelegationPeer::doCount($oCriteria) == 1) {
$aFields['APP_STATUS'] = 'CANCELLED'; $aFields['APP_STATUS'] = 'CANCELLED';
$oApplication->update($aFields); $oApplication->update($aFields);
G::LoadClass('reportTables'); G::LoadClass('reportTables');
require_once 'classes/model/AdditionalTables.php'; require_once 'classes/model/AdditionalTables.php';
$oReportTables = new ReportTables(); $oReportTables = new ReportTables();
$addtionalTables = new additionalTables(); $addtionalTables = new additionalTables();
$oReportTables->updateTables($aFields['PRO_UID'], $aFields['APP_UID'], $aFields['APP_NUMBER'], $aFields['APP_DATA']); $oReportTables->updateTables($aFields['PRO_UID'], $aFields['APP_UID'], $aFields['APP_NUMBER'], $aFields['APP_DATA']);
$addtionalTables->updateReportTables($aFields['PRO_UID'], $aFields['APP_UID'], $aFields['APP_NUMBER'], $aFields['APP_DATA'], $aFields['APP_STATUS']); $addtionalTables->updateReportTables($aFields['PRO_UID'], $aFields['APP_UID'], $aFields['APP_NUMBER'], $aFields['APP_DATA'], $aFields['APP_STATUS']);
} }
$this->CloseCurrentDelegation($sApplicationUID, $iIndex); $this->CloseCurrentDelegation($sApplicationUID, $iIndex);
@@ -4932,9 +4932,9 @@ class Cases
throw (new Exception("Template file \"$fileTemplate\" does not exist.")); throw (new Exception("Template file \"$fileTemplate\" does not exist."));
} }
$sBody = G::replaceDataGridField(file_get_contents($fileTemplate), $aFields); $sBody = G::replaceDataGridField(file_get_contents($fileTemplate), $aFields, false);
} else { } else {
$sBody = nl2br(G::replaceDataGridField($aTaskInfo["TAS_DEF_MESSAGE"], $aFields)); $sBody = nl2br(G::replaceDataGridField($aTaskInfo["TAS_DEF_MESSAGE"], $aFields, false));
} }
G::LoadClass("tasks"); G::LoadClass("tasks");
@@ -5910,7 +5910,7 @@ class Cases
$oCriteria->add(AppMessagePeer::APP_MSG_SHOW_MESSAGE, 1); $oCriteria->add(AppMessagePeer::APP_MSG_SHOW_MESSAGE, 1);
} }
$oCriteria->addAscendingOrderByColumn(AppMessagePeer::APP_MSG_DATE); $oCriteria->addAscendingOrderByColumn(AppMessagePeer::APP_MSG_DATE);
$oDataset = AppMessagePeer::doSelectRS($oCriteria); $oDataset = AppMessagePeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next(); $oDataset->next();
@@ -6759,27 +6759,27 @@ class Cases
} }
} }
public function ordProcess ($a, $b) public function ordProcess ($a, $b)
{ {
if ($this->sort == '') { if ($this->sort == '') {
$this->sort = 'APP_MSG_DATE'; $this->sort = 'APP_MSG_DATE';
} }
if ($this->dir=='ASC') { if ($this->dir=='ASC') {
if ($a[$this->sort] > $b[$this->sort]) { if ($a[$this->sort] > $b[$this->sort]) {
return 1; return 1;
} elseif ($a[$this->sort] < $b[$this->sort]) { } elseif ($a[$this->sort] < $b[$this->sort]) {
return - 1; return - 1;
} else { } else {
return 0; return 0;
} }
} else { } else {
if ($a[$this->sort] > $b[$this->sort]) { if ($a[$this->sort] > $b[$this->sort]) {
return - 1; return - 1;
} elseif ($a[$this->sort] < $b[$this->sort]) { } elseif ($a[$this->sort] < $b[$this->sort]) {
return 1; return 1;
} else { } else {
return 0; return 0;
} }
} }
} }
} }

4
workflow/engine/classes/class.wsBase.php
View File

@@ -970,7 +970,7 @@ class wsBase
$Fields = array_merge( $oldFields['APP_DATA'], $appFields ); $Fields = array_merge( $oldFields['APP_DATA'], $appFields );
} }
$sBody = G::replaceDataGridField(file_get_contents($fileTemplate), $Fields); $sBody = G::replaceDataGridField(file_get_contents($fileTemplate), $Fields, false);
$hasEmailFrom = preg_match( '/(.+)@(.+)\.(.+)/', $sFrom, $match ); $hasEmailFrom = preg_match( '/(.+)@(.+)\.(.+)/', $sFrom, $match );
if (!$hasEmailFrom || strpos($sFrom, $aSetup["MESS_ACCOUNT"]) === false) { if (!$hasEmailFrom || strpos($sFrom, $aSetup["MESS_ACCOUNT"]) === false) {
@@ -3288,7 +3288,7 @@ class wsBase
return $result; return $result;
} }
} }
/** /**
* ClaimCase * ClaimCase
* *