fernando/luos
1
0
Fork 0
Code Releases Activity

BUG 10110 Añr modulo de logs para envio de correos electronicos SOLVED

Browse Source 
- According to the specifications.
- Was add the the list of emails.Merge remote branch 'origin/BUG-10110' into BUG-10110

Conflicts:
	workflow/engine/templates/mails/emailList.js
This commit is contained in:
Marco Antonio Nina
2012-11-28 14:43:59 -04:00
parent f26704e315 39d79e398b
commit 43c320d7fd
2 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/engine/methods/mails/emailList.php
View File

@@ -1,6 +1,6 @@
<?php
/**
* eventList.php
* emailList.php
*
* ProcessMaker Open Source Edition
* Copyright (C) 2004 - 2008 Colosa Inc.23
@@ -46,12 +46,7 @@ $status = array (
array ("sent", "Sent"),
array ("pending", "Pending")
);
//$type = array (array ('',G::LoadTranslation( 'ID_ALL' )
//),array ('SEND_MESSAGE',G::LoadTranslation( 'ID_EVENT_MESSAGE' )
//),array ('EXECUTE_TRIGGER',G::LoadTranslation( 'ID_EVENT_TIMER' )
//),array ('EXECUTE_CONDITIONAL_TRIGGER',G::LoadTranslation( 'ID_EVENT_CONDITIONAL' )
//)
//);
$processes = getProcessArray( $userUid );
$G_PUBLISH = new Publisher();
@@ -60,7 +55,6 @@ $oHeadPublisher = & headPublisher::getSingleton();
$oHeadPublisher->addExtJsScript( 'mails/emailList', false ); //adding a javascript file .js
$oHeadPublisher->addContent( 'mails/emailList' ); //adding a html file .html.
//sending the columns to display in grid
//$oHeadPublisher->assign( 'typeValues', $type );
$oHeadPublisher->assign( 'statusValues', $status );
$oHeadPublisher->assign( 'processValues', $processes );

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

@@ -121,7 +121,11 @@ Ext.onReady(function(){
iconCls: 'no-icon'
});
<<<<<<< HEAD
actions = _addPluginActions([ {xtype: 'tbfill'}, _('ID_PROCESS'), comboProcess, '-', _('ID_STATUS'), comboStatus, _('ID_DELEGATE_DATE_FROM'),
=======
actions = _addPluginActions([ {xtype: 'tbfill'}, _('ID_PROCESS'), comboProcess, '-', /*_('ID_TYPE'), comboType, '-',*/ _('ID_STATUS'), comboStatus, _('ID_DELEGATE_DATE_FROM'),
>>>>>>> origin/BUG-10110
dateFrom,
' ',
_('ID_TO'),
@@ -177,6 +181,7 @@ Ext.onReady(function(){
var expander = new Ext.ux.grid.RowExpander({
tpl : new Ext.Template(
<<<<<<< HEAD
"<hr/><b>"+
_('ID_PREVIEW')+
":</b><br/>"+
@@ -186,6 +191,17 @@ Ext.onReady(function(){
"<div style='float: left; width: 10%;'>&nbsp;</div>"+
"</div>"+
"<hr/><br>"
=======
'<p><hr/><b>'+_('ID_PREVIEW')+':</b><br/>'+
'<center>'+
'<div style = "display: table; width: 100%; margin: 5px;">'+
'<div style="float: left; width: 10%;">&nbsp;</div>'+
'<div style="float: left; width: 80%; border: 0px dashed #660000;"> {APP_MSG_BODY}</div>'+
'<div style="float: left; width: 10%;">&nbsp;</div>'+
'</div>'+
'</center>'+
'</p><hr/><br>'
>>>>>>> origin/BUG-10110
)
});
@@ -211,14 +227,29 @@ Ext.onReady(function(){
{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_DATE_LABEL'), dataIndex: 'APP_MSG_DATE', width: 80,hidden:false, renderer: columnRenderer, sortable: true},
<<<<<<< HEAD
{header: _('ID_SUBJECT'), dataIndex: 'APP_MSG_SUBJECT', width: 80,hidden:false, renderer: columnRenderer, sortable: true},
{header: _('ID_FROM'), dataIndex: 'APP_MSG_FROM', width: 80,hidden:false,renderer: columnRenderer, sortable: true},
{header: _('ID_TO'), dataIndex: 'APP_MSG_TO', width: 80,hidden:false,renderer: columnRenderer, sortable: true},
=======
//{header: _('ID_DERIVED'), dataIndex: 'APP_MSG_SEND_DATE', width: 80,hidden:false,hideable:false, renderer: columnRenderer, sortable: true},
{header: _('ID_SUBJECT'), dataIndex: 'APP_MSG_SUBJECT', width: 80,hidden:false, renderer: columnRenderer, sortable: true},
{header: _('ID_FROM'), dataIndex: 'APP_MSG_FROM', width: 80,hidden:false,renderer: columnRenderer, sortable: true},
{header: _('ID_TO'), dataIndex: 'APP_MSG_TO', width: 80,hidden:false,renderer: columnRenderer, sortable: true},
//{header: _('ID_STATUS'), dataIndex: 'APP_MSG_STATUS', width: 50,hidden:false,hideable:false, renderer: columnRenderer, sortable: true}
>>>>>>> origin/BUG-10110
{
header: _('ID_STATUS'),
dataIndex: 'APP_MSG_STATUS',
width: 50,
<<<<<<< HEAD
renderer: columnRenderer,
=======
//hidden:false,
//hideable:false,
renderer: columnRenderer,
//sortable: true,
>>>>>>> origin/BUG-10110
editor: new Ext.form.ComboBox({
listClass: 'x-combo-list-small',
mode: 'local',