fernando/luos
1
0
Fork 0
Code Releases Activity

Merge pull request #1180 from marcoAntonioNina/BUG-10336

Browse Source 
BUG 10336 Columna Case Title debe ser agregada en logs de emails SOLVED
This commit is contained in:
julceslauhub
2013-01-10 08:48:41 -08:00
parent 5b462b5e1a 704db9da6c
commit 95e6c38c71
2 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
workflow/engine/methods/mails/emailsAjax.php
View File

@@ -62,6 +62,7 @@ switch($req){
$criteria->addSelectColumn(AppMessagePeer::APP_MSG_SHOW_MESSAGE); $criteria->addSelectColumn(AppMessagePeer::APP_MSG_SHOW_MESSAGE);
$criteria->addSelectColumn(ApplicationPeer::PRO_UID); $criteria->addSelectColumn(ApplicationPeer::PRO_UID);
$criteria->addSelectColumn(ApplicationPeer::APP_NUMBER);
$criteria->addAsColumn('PRO_TITLE', 'C2.CON_VALUE'); $criteria->addAsColumn('PRO_TITLE', 'C2.CON_VALUE');
$criteria->addAlias('C2', 'CONTENT'); $criteria->addAlias('C2', 'CONTENT');
@@ -110,33 +111,33 @@ switch($req){
$result->setFetchmode(ResultSet::FETCHMODE_ASSOC); $result->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$data = Array(); $data = Array();
$dataPro = array(); $dataPro = array();
$index = 0; $index = 1;
$content = new Content(); $content = new Content();
$tasTitleDefault = G::LoadTranslation('ID_TASK_NOT_RELATED'); $tasTitleDefault = G::LoadTranslation('ID_TASK_NOT_RELATED');
while ( $result->next() ) { while ( $result->next() ) {
$row = $result->getRow(); $row = $result->getRow();
$row['APP_MSG_FROM'] =htmlentities($row['APP_MSG_FROM'], ENT_QUOTES, "UTF-8"); $row['APP_MSG_FROM'] =htmlentities($row['APP_MSG_FROM'], ENT_QUOTES, "UTF-8");
$row['APP_MSG_STATUS'] = ucfirst ( $row['APP_MSG_STATUS']); $row['APP_MSG_STATUS'] = ucfirst ( $row['APP_MSG_STATUS']);
$row['TAS_TITLE'] = $tasTitleDefault;
if ($row['DEL_INDEX'] != 0) { if ($row['DEL_INDEX'] != 0) {
$criteria = new Criteria(); $index = $row['DEL_INDEX'];
$criteria->addSelectColumn(AppDelegationPeer::PRO_UID); }
$criteria->addSelectColumn(AppDelegationPeer::TAS_UID);
$criteria->addSelectColumn(AppDelegationPeer::DEL_INDEX); $criteria = new Criteria();
$criteria->add(AppDelegationPeer::APP_UID, $row['APP_UID']); $criteria->addSelectColumn(AppCacheViewPeer::APP_TITLE);
$resultDelegation = AppDelegationPeer::doSelectRS($criteria); $criteria->addSelectColumn(AppCacheViewPeer::APP_TAS_TITLE);
$resultDelegation->setFetchmode(ResultSet::FETCHMODE_ASSOC); $criteria->add(AppCacheViewPeer::APP_UID, $row['APP_UID']);
$row['TAS_TITLE'] = '-'; $criteria->add(AppCacheViewPeer::DEL_INDEX, $index);
while ($resultDelegation->next()) { $resultCacheView = AppCacheViewPeer::doSelectRS($criteria);
$rowDelegation = $resultDelegation->getRow(); $resultCacheView->setFetchmode(ResultSet::FETCHMODE_ASSOC);
if ($row['DEL_INDEX'] == $rowDelegation['DEL_INDEX']) { $row['APP_TITLE'] = '-';
$row['TAS_TITLE'] = $content->load( 'TAS_TITLE', '', $rowDelegation['TAS_UID'], SYS_LANG ); while ($resultCacheView->next()) {
break; $rowCacheView = $resultCacheView->getRow();
} $row['APP_TITLE'] = $rowCacheView['APP_TITLE'];
} $row['TAS_TITLE'] = $rowCacheView['APP_TAS_TITLE'];
}
if ($row['DEL_INDEX'] == 0) {
$row['TAS_TITLE'] = $tasTitleDefault;
} }
$data[] = $row; $data[] = $row;
} }
$response = array(); $response = array();

4
workflow/engine/templates/mails/emailList.js
View File

@@ -161,8 +161,10 @@ Ext.onReady(function(){
{name : 'DEL_INDEX'}, {name : 'DEL_INDEX'},
{name : 'PRO_UID'}, {name : 'PRO_UID'},
{name : 'TAS_UID'}, {name : 'TAS_UID'},
{name : 'APP_NUMBER'},
{name : 'PRO_TITLE'}, {name : 'PRO_TITLE'},
{name : 'TAS_TITLE'}, {name : 'TAS_TITLE'},
{name : 'APP_TITLE'},
{name : 'APP_MSG_TYPE'}, {name : 'APP_MSG_TYPE'},
{name : 'APP_MSG_SUBJECT'}, {name : 'APP_MSG_SUBJECT'},
{name : 'APP_MSG_FROM'}, {name : 'APP_MSG_FROM'},
@@ -208,6 +210,8 @@ Ext.onReady(function(){
{header: 'DEL_INDEX', dataIndex: 'DEL_INDEX', hidden:true, hideable:false}, {header: 'DEL_INDEX', dataIndex: 'DEL_INDEX', hidden:true, hideable:false},
{header: 'PRO_UID', dataIndex: 'PRO_UID', hidden:true, hideable:false, sortable: false}, {header: 'PRO_UID', dataIndex: 'PRO_UID', hidden:true, hideable:false, sortable: false},
{header: 'TAS_UID', dataIndex: 'TAS_UID', hidden:true, hideable:false, sortable: false}, {header: 'TAS_UID', dataIndex: 'TAS_UID', hidden:true, hideable:false, sortable: false},
{header: _('ID_HEADER_NUMBER'), dataIndex: 'APP_NUMBER', width: 40, hidden: false,renderer: columnRenderer, sortable: true},
{header: _('ID_CASE'), dataIndex: 'APP_TITLE', width: 100, hidden: false,renderer: columnRenderer, sortable: false},
{header: _('ID_PROCESS'), dataIndex: 'PRO_TITLE', width: 100, hidden: false,renderer: columnRenderer, sortable: false}, {header: _('ID_PROCESS'), dataIndex: 'PRO_TITLE', width: 100, hidden: false,renderer: columnRenderer, sortable: false},
{header: _('ID_TASK'), dataIndex: 'TAS_TITLE', width: 100, hidden: false,renderer: columnRenderer, sortable: false}, {header: _('ID_TASK'), dataIndex: 'TAS_TITLE', width: 100, hidden: false,renderer: columnRenderer, sortable: false},
{header: _('ID_TYPE'), dataIndex: 'APP_MSG_TYPE', width: 50, hidden: false,renderer: columnRenderer, sortable: true}, {header: _('ID_TYPE'), dataIndex: 'APP_MSG_TYPE', width: 50, hidden: false,renderer: columnRenderer, sortable: true},