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

Merged in bugfix/HOR-4840 (pull request #6605)

Browse Source 
HOR-4840

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2018-08-28 12:33:28 +00:00
committed by Julio Cesar Laura Avendaño
parent 543379f08c 55a1a73c47
commit f1ccdc4ee2
2 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4194,7 +4194,7 @@ class Processes
foreach ($arrayData as $value) { foreach ($arrayData as $value) {
if (isset($value['__EMAIL_SERVER_UID_PRESERVED__']) && $value['__EMAIL_SERVER_UID_PRESERVED__'] === true) { if (isset($value['__EMAIL_SERVER_UID_PRESERVED__']) && $value['__EMAIL_SERVER_UID_PRESERVED__'] === true) {
unset($value['__EMAIL_SERVER_UID_PRESERVED__']); unset($value['__EMAIL_SERVER_UID_PRESERVED__']);
} else { } elseif(!EmailServer::exists($value['EMAIL_SERVER_UID'])) {
unset($value['EMAIL_EVENT_FROM']); unset($value['EMAIL_EVENT_FROM']);
unset($value['EMAIL_SERVER_UID']); unset($value['EMAIL_SERVER_UID']);
} }

56
workflow/engine/classes/model/EmailServer.php
View File

@@ -1,28 +1,46 @@
<?php <?php
class EmailServer extends BaseEmailServer class EmailServer extends BaseEmailServer
{ {
/** /**
* Get the evn_description column value. * Load the default account
* *
* @return string * @return array
*/ */
public function loadDefaultAccount () public function loadDefaultAccount()
{ {
$c = new Criteria( 'workflow' ); $c = new Criteria('workflow');
$del = DBAdapter::getStringDelimiter(); $c->clearSelectColumns();
$c->addSelectColumn(EmailServerPeer::MESS_ACCOUNT);
$c->add(EmailServerPeer::MESS_DEFAULT, 1);
$rs = EmailServerPeer::doSelectRS($c, Propel::getDBConnection('workflow_ro'));
$rs->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$rs->next();
$response = $rs->getRow();
$c->clearSelectColumns(); return $response;
$c->addSelectColumn( EmailServerPeer::MESS_ACCOUNT ); }
$c->add( EmailServerPeer::MESS_DEFAULT, 1 ); /**
* Check if the MESS_UID exist
*
* @param string $emailServerUid
*
* @return boolean
* @throws Exception
*/
public static function exists($emailServerUid)
{
try {
$criteria = new Criteria('workflow');
$criteria->add(EmailServerPeer::MESS_UID, $emailServerUid, Criteria::EQUAL);
$dataset = EmailServerPeer::doSelectOne($criteria);
$rs = EmailServerPeer::doSelectRS( $c, Propel::getDBConnection('workflow_ro') ); return !is_null($dataset);
$rs->setFetchmode( ResultSet::FETCHMODE_ASSOC );
$rs->next();
$row = $rs->getRow();
$response=$row;
return $response; } catch (Exception $e) {
} throw $e;
}
}
} }