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

Merge branch 'release/3.2' of bitbucket.org:colosa/processmaker into bugfix/HOR-2868

Browse Source
This commit is contained in:
Paula Quispe
2017-03-16 14:53:26 -04:00
parent 72cfb8fed2 3ab4dc6ccd
commit 465e18d493
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5357,8 +5357,9 @@ class Cases
if (!class_exists('System')) { if (!class_exists('System')) {
G::LoadClass('system'); G::LoadClass('system');
} }
$aConfiguration = ($aTaskInfo['TAS_EMAIL_SERVER_UID'] != '') ? $aConfiguration = (!is_null(\EmailServerPeer::retrieveByPK($aTaskInfo['TAS_EMAIL_SERVER_UID']))) ?
$eServer->getEmailServer($aTaskInfo['TAS_EMAIL_SERVER_UID'], true) : $eServer->getEmailServerDefault(); $eServer->getEmailServer($aTaskInfo['TAS_EMAIL_SERVER_UID'], true) :
$eServer->getEmailServerDefault();
$msgError = ''; $msgError = '';
if (empty($aConfiguration)) { if (empty($aConfiguration)) {
$msgError = G::LoadTranslation('ID_THE_DEFAULT_CONFIGURATION'); $msgError = G::LoadTranslation('ID_THE_DEFAULT_CONFIGURATION');
@@ -5440,8 +5441,9 @@ class Cases
if (!class_exists('System')) { if (!class_exists('System')) {
G::LoadClass('system'); G::LoadClass('system');
} }
$aConfiguration = ($aTaskInfo['TAS_RECEIVE_SERVER_UID'] != '') ? $aConfiguration = (!is_null(\EmailServerPeer::retrieveByPK($aTaskInfo['TAS_RECEIVE_SERVER_UID']))) ?
$eServer->getEmailServer($aTaskInfo['TAS_RECEIVE_SERVER_UID'], true) : $eServer->getEmailServerDefault(); $eServer->getEmailServer($aTaskInfo['TAS_RECEIVE_SERVER_UID'], true) :
$eServer->getEmailServerDefault();
$msgError = ''; $msgError = '';
if (empty($aConfiguration)) { if (empty($aConfiguration)) {
$msgError = G::LoadTranslation('ID_THE_DEFAULT_CONFIGURATION'); $msgError = G::LoadTranslation('ID_THE_DEFAULT_CONFIGURATION');

3
workflow/engine/config/schema.xml
View File

@@ -337,6 +337,9 @@
<column name="APP_MSG_SEND_DATE" type="TIMESTAMP" required="true"/> <column name="APP_MSG_SEND_DATE" type="TIMESTAMP" required="true"/>
<column name="APP_MSG_SHOW_MESSAGE" type="TINYINT" required="true" default="1"/> <column name="APP_MSG_SHOW_MESSAGE" type="TINYINT" required="true" default="1"/>
<column name="APP_MSG_ERROR" type="LONGVARCHAR" required="false"/> <column name="APP_MSG_ERROR" type="LONGVARCHAR" required="false"/>
<index name="indexForAppUid">
<index-column name="APP_UID"/>
</index>
</table> </table>
<table name="APP_OWNER"> <table name="APP_OWNER">
<vendor type="mysql"> <vendor type="mysql">

3
workflow/engine/data/mysql/schema.sql
View File

@@ -161,7 +161,8 @@ CREATE TABLE `APP_MESSAGE`
`APP_MSG_SEND_DATE` DATETIME NOT NULL, `APP_MSG_SEND_DATE` DATETIME NOT NULL,
`APP_MSG_SHOW_MESSAGE` TINYINT default 1 NOT NULL, `APP_MSG_SHOW_MESSAGE` TINYINT default 1 NOT NULL,
`APP_MSG_ERROR` MEDIUMTEXT, `APP_MSG_ERROR` MEDIUMTEXT,
PRIMARY KEY (`APP_MSG_UID`) PRIMARY KEY (`APP_MSG_UID`),
KEY `indexForAppUid`(`APP_UID`)
)ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Messages in an Application'; )ENGINE=InnoDB DEFAULT CHARSET='utf8' COMMENT='Messages in an Application';
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
#-- APP_OWNER #-- APP_OWNER