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

PMC-980 Merge remote-tracking branch 'upstream/feature/PMC-43' into bugfix/PMC-980

Browse Source 
# Conflicts:
#	workflow/engine/classes/WsBase.php
This commit is contained in:
Roly Rudy Gutierrez Pinto
2019-07-22 11:24:00 -04:00
parent 7355bd3522
commit 7f55e951fa
27 changed files with 2210 additions and 501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
workflow/engine/classes/model/AbeConfiguration.php
View File

@@ -26,6 +26,7 @@ class AbeConfiguration extends BaseAbeConfiguration
'DYN_UID',
'ABE_EMAIL_FIELD',
'ABE_ACTION_FIELD',
'ABE_ACTION_BODY_FIELD',
'ABE_CASE_NOTE_IN_RESPONSE',
'ABE_FORCE_LOGIN',
'ABE_CREATE_DATE',
@@ -33,7 +34,8 @@ class AbeConfiguration extends BaseAbeConfiguration
'ABE_SUBJECT_FIELD',
'ABE_MAILSERVER_OR_MAILCURRENT',
'ABE_CUSTOM_GRID',
'ABE_EMAIL_SERVER_UID'
'ABE_EMAIL_SERVER_UID',
'ABE_EMAIL_SERVER_RECEIVER_UID'
];
public function load($abeUid)
@@ -152,6 +154,7 @@ class AbeConfiguration extends BaseAbeConfiguration
$criteria->addSelectColumn(AbeConfigurationPeer::DYN_UID);
$criteria->addSelectColumn(AbeConfigurationPeer::ABE_EMAIL_FIELD);
$criteria->addSelectColumn(AbeConfigurationPeer::ABE_ACTION_FIELD);
$criteria->addSelectColumn(AbeConfigurationPeer::ABE_ACTION_BODY_FIELD);
$criteria->addSelectColumn(AbeConfigurationPeer::ABE_SUBJECT_FIELD);
$criteria->addSelectColumn(AbeConfigurationPeer::ABE_MAILSERVER_OR_MAILCURRENT);
$criteria->addSelectColumn(AbeConfigurationPeer::ABE_CUSTOM_GRID);