diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php index 9db2d6d56..95bcb235f 100755 --- a/workflow/engine/classes/class.case.php +++ b/workflow/engine/classes/class.case.php @@ -5890,6 +5890,8 @@ class Cases $aMessages = array(); while ($aRow = $oDataset->getRow()) { + //Head for IE quirks mode + $sBody = ''.$aRow['APP_MSG_BODY']; $aMessages[] = array('APP_MSG_UID' => $aRow['APP_MSG_UID'], 'APP_UID' => $aRow['APP_UID'], 'DEL_INDEX' => $aRow['DEL_INDEX'], @@ -5897,7 +5899,7 @@ class Cases 'APP_MSG_SUBJECT' => $aRow['APP_MSG_SUBJECT'], 'APP_MSG_FROM' => $aRow['APP_MSG_FROM'], 'APP_MSG_TO' => $aRow['APP_MSG_TO'], - 'APP_MSG_BODY' => $aRow['APP_MSG_BODY'], + 'APP_MSG_BODY' => $sBody, 'APP_MSG_DATE' => $aRow['APP_MSG_DATE'], 'APP_MSG_CC' => $aRow['APP_MSG_CC'], 'APP_MSG_BCC' => $aRow['APP_MSG_BCC'], diff --git a/workflow/engine/classes/class.dynaformEditor.php b/workflow/engine/classes/class.dynaformEditor.php index c746a99d0..398a1a967 100755 --- a/workflow/engine/classes/class.dynaformEditor.php +++ b/workflow/engine/classes/class.dynaformEditor.php @@ -543,7 +543,7 @@ class dynaformEditorAjax extends dynaformEditor implements iDynaformEditorAjax public function set_htmlcode($A, $htmlcode) { try { - $iOcurrences = preg_match_all('/\{\$\S*\s*\}/im', $htmlcode, $matches); + $iOcurrences = preg_match_all('/\{\$.*?\}/im', $htmlcode, $matches); if ($iOcurrences) { if (isset($matches[0])) { $tagsHtml = $matches[0]; diff --git a/workflow/engine/templates/cases/caseMessageHistory.js b/workflow/engine/templates/cases/caseMessageHistory.js index bef133c2f..70c3d929b 100644 --- a/workflow/engine/templates/cases/caseMessageHistory.js +++ b/workflow/engine/templates/cases/caseMessageHistory.js @@ -2,12 +2,14 @@ * @author: Douglas Medrano * May 03, 2011 */ - + //var windowMessage; + windowMessage = new Object(); function onResizeIframe(idIframe){ window.parent.tabIframeWidthFix2(idIframe); } function windowPreviewMessage(rowSelected) { + windowMessage = new Ext.Window({ title: '', width: 600, @@ -135,111 +137,6 @@ } - previewMessage = function() { - var rowSelected = Ext.getCmp('processesGrid').getSelectionModel().getSelected(); - if (rowSelected) { - windowPreviewMessage(rowSelected); - /* - windowMessage = new Ext.Window({ - title: '', - width: 600, - height: 420, - border: false, - layout : 'fit', - items: - [ - { - xtype: 'form', - frame: true, - border: false, - defaults: { - width: 150 - }, - items: [ - { - xtype: 'textfield', - fieldLabel: _("ID_FROM"), - id:'From', - anchor: '100%', - arrowAlign:'center', - readOnly: true, - name: 'From' - }, - { - xtype: 'textfield', - fieldLabel: _("ID_TO"), - id: 'To', - anchor: '100%', - arrowAlign:'center', - readOnly: true, - name: 'To' - }, - { - xtype: 'textfield', - fieldLabel: _('ID_SUBJECT'), - id: 'Subjet', - anchor: '100%', - arrowAlign:'center', - readOnly: true, - name: 'Subjet' - }, - { - xtype: 'textfield', - fieldLabel: _("DATE_LABEL"), - id: 'date', - arrowAlign:'center', - readOnly: true, - name: 'Status' - }, - { - name : 'body', - id:'body', - hideLabel:true, - xtype: 'htmleditor', - autoScroll: true, - readOnly: true, - x: 1, - y: 1, - enableAlignments:false, - enableColors:false, - enableFont:false, - enableFontSize:false, - enableFormat:false, - enableLinks:false, - enableLists:false, - enableSourceEdit:false, - anchor: '100%', - height: 260 - } - ] - } - ] - }); - - //load fields from rowSelect - Ext.getCmp('From').setValue(rowSelected.data.APP_MSG_FROM); - Ext.getCmp('To').setValue(rowSelected.data.APP_MSG_TO); - Ext.getCmp('Subjet').setValue(rowSelected.data.APP_MSG_SUBJECT); - Ext.getCmp('date').setValue(rowSelected.data.APP_MSG_DATE); - Ext.getCmp('body').setValue(rowSelected.data.APP_MSG_BODY); - - //show windows message - windowMessage.show(windowMessage); - */ - - } - else { - Ext.Msg.show({ - title:'', - msg: _("ID_NO_SELECTION_WARNING"), - buttons: Ext.Msg.INFO, - fn: function(){}, - animEl: 'elId', - icon: Ext.MessageBox.INFO, - buttons: Ext.MessageBox.OK - }); - } - } function ajaxPostRequest(url, callback_function, id){ var d = new Date(); @@ -419,12 +316,6 @@ var ActionTabFrameGlobal = ''; buttons: Ext.MessageBox.OK }); - - - - - - Ext.destroy(Ext.getCmp('processesGrid')); messageHistoryGridList(); @@ -576,7 +467,10 @@ var ActionTabFrameGlobal = ''; handler: function(grid, rowIndex, colIndex) { var rec = store.getAt(rowIndex); if (rec.get('MSGS_HISTORY') === 'VIEW' || rec.get('MSGS_HISTORY') === 'RESEND') { - windowPreviewMessage(rec); + if ( typeof windowMessage === 'object' && typeof windowMessage.close === 'function'){ + windowMessage.close(); + } + windowPreviewMessage(rec); } } } @@ -587,79 +481,17 @@ var ActionTabFrameGlobal = ''; ] }), store: store, -/* - tbar:[ - { - text:_("ID_RESEND"), - id:'sendMailMessageFormRadioId', - iconCls: 'button_menu_ext', - icon: '/images/mail-send16x16.png', - handler: function(){ - var rowSelected = processesGrid.getSelectionModel().getSelected(); - - if( rowSelected ){ - resendDialog(rowSelected); - } - else{ - Ext.Msg.show({ - title:'', - msg: TRANSLATIONS.ID_NO_SELECTION_WARNING, - buttons: Ext.Msg.INFO, - fn: function(){}, - animEl: 'elId', - icon: Ext.MessageBox.INFO, - buttons: Ext.MessageBox.OK - - }); - } - - }, - disabled:false - }, - { - xtype: 'tbseparator' - }, - { - text:_("ID_PREVIEW"), - id:'viewMailMessageFormRadioId', - iconCls: 'button_menu_ext', - icon: '/images/documents/_filefind.png', - handler: function(){ - var rowSelected = processesGrid.getSelectionModel().getSelected(); - - if (rowSelected) { - previewMessage(); - } else { - Ext.Msg.show({ - title:'', - msg: _("ID_NO_SELECTION_WARNING"), - buttons: Ext.Msg.INFO, - fn: function(){}, - animEl: 'elId', - icon: Ext.MessageBox.INFO, - buttons: Ext.MessageBox.OK - }); - } - }, - disabled:false - }, - { - xtype: 'tbfill' - } - ], -*/ bbar: new Ext.PagingToolbar({ pageSize: 20, store: store, displayInfo: true, - displayMsg: _('ID_DISPLAY_PROCESSES'), + displayMsg: _('ID_GRID_PAGE_DISPLAYING_ITEMS'), emptyMsg: "", items:[] }), listeners: { - // rowdblclick: previewMessage, render: function(){ this.loadMask = new Ext.LoadMask(this.body, {msg:'Loading...'}); processesGrid.getSelectionModel().on('rowselect', function(){ diff --git a/workflow/engine/templates/cases/open.js b/workflow/engine/templates/cases/open.js index 0a21d9f1b..0a7071494 100755 --- a/workflow/engine/templates/cases/open.js +++ b/workflow/engine/templates/cases/open.js @@ -762,6 +762,7 @@ Ext.onReady(function(){ width:500, plain: true, modal: true, + resizable: false, title: _('ID_CONFIRM'), items: [ new Ext.FormPanel({ @@ -904,6 +905,7 @@ Ext.onReady(function(){ layout:'fit', autoScroll:true, modal: true, + resizable: false, maximizable: false, items: [grid] }); @@ -976,6 +978,7 @@ Ext.onReady(function(){ var fieldset = { xtype : 'fieldset', labelWidth: 150, + width:380, //autoHeight : true, defaults : { width : 170, @@ -1045,12 +1048,13 @@ Ext.onReady(function(){ var win = new Ext.Window({ title: _('ID_PAUSE_CASE'), width: 380, - height: 250, + height: 260, layout:'fit', autoScroll:true, modal: true, maximizable: false, resizable: false, + draggable: false, items: [frm] }); Ext.Ajax.request({ diff --git a/workflow/engine/templates/pmTables/edit.js b/workflow/engine/templates/pmTables/edit.js index 55d88e3d1..2cfb170a3 100755 --- a/workflow/engine/templates/pmTables/edit.js +++ b/workflow/engine/templates/pmTables/edit.js @@ -446,6 +446,7 @@ Ext.onReady(function(){ ddGroup : 'availableGridDDGroup', enableDragDrop : true, enableColumnResize : true, + enableColumnMove: false, viewConfig : {forceFit:true}, cm: cm, sm: sm, diff --git a/workflow/engine/templates/users/users.js b/workflow/engine/templates/users/users.js index 54788e47b..2423d4496 100755 --- a/workflow/engine/templates/users/users.js +++ b/workflow/engine/templates/users/users.js @@ -1159,6 +1159,9 @@ function saveUser() } else { userFrmEditSubmit(); } + } else { + // Another field changed + userFrmEditSubmit(); } } }, @@ -1194,6 +1197,9 @@ function saveUser() } else { userFrmEditSubmit(); } + } else { + // Another field changed + userFrmEditSubmit(); } } },