Merge remote-tracking branch 'upstream/master'

gulliver/system/class.g.php

@@ -1395,24 +1395,22 @@ class G
         if ($lang === '') {
             $lang = defined( SYS_LANG ) ? SYS_LANG : 'en';
         }
+
         $aux = explode( ' ', $date ); //para dividir la fecha del dia
         $date = explode( '-', isset( $aux[0] ) ? $aux[0] : '00-00-00' ); //para obtener los dias, el mes, y el año.
         $time = explode( ':', isset( $aux[1] ) ? $aux[1] : '00:00:00' ); //para obtener las horas, minutos, segundos.
 
-
         $year = (int) ((isset( $date[0] )) ? $date[0] : '0'); //year
         $month = (int) ((isset( $date[1] )) ? $date[1] : '0'); //month
         $day = (int) ((isset( $date[2] )) ? $date[2] : '0'); //day
 
-
         $h = isset( $time[0] ) ? $time[0] : '00'; //hour
         $i = isset( $time[1] ) ? $time[1] : '00'; //minute
         $s = isset( $time[2] ) ? $time[2] : '00'; //second
 
-
         $MONTHS = Array ();
-        for ($i = 1; $i <= 12; $i ++) {
+        for ($j = 1; $j <= 12; $j ++) {
-            $MONTHS[$i] = G::LoadTranslation( "ID_MONTH_$i", $lang );
+          $MONTHS[$j] = G::LoadTranslation( "ID_MONTH_$j", $lang );
         }
 
         $d = (int) $day;
@@ -1420,7 +1418,6 @@ class G
 
         //missing D
 
-
         $M = $MONTHS[$month];
         $m = (int) $month;
         $mm = G::complete_field( $month, 2, 1 );

workflow/engine/classes/class.case.php

@@ -5085,7 +5085,13 @@ class Cases
         $aCase = $this->loadCase($APP_UID);
         $USER_PERMISSIONS = Array();
         $GROUP_PERMISSIONS = Array();
-        $RESULT = Array("DYNAFORM" => Array(), "INPUT" => Array(), "OUTPUT" => Array(), "CASES_NOTES" => 0);
+        $RESULT = Array(
+            "DYNAFORM" => Array(),
+            "INPUT" => Array(),
+            "OUTPUT" => Array(),
+            "CASES_NOTES" => 0,
+            "MSGS_HISTORY" => Array()
+        );
 
         //permissions per user
         $oCriteria = new Criteria('workflow');
@@ -5342,6 +5348,37 @@ class Cases
                     case 'CASES_NOTES':
                         $RESULT['CASES_NOTES'] = 1;
                         break;
+                    case 'MSGS_HISTORY':
+                        // Permission
+                        $RESULT['MSGS_HISTORY'] = array('PERMISSION' => $ACTION);
+                        $delIndex = array();
+                        if ($TASK_SOURCE != "" && (int)$TASK_SOURCE != 0) {
+                            $oCriteria = new Criteria('workflow');
+
+                            $oCriteria->add(AppDelegationPeer::APP_UID, $APP_UID);
+                            $oCriteria->add(AppDelegationPeer::PRO_UID, $PRO_UID);
+                            if ($aCase['APP_STATUS'] != 'COMPLETED') {
+                                if ($TASK_SOURCE != '' && $TASK_SOURCE != "0" && $TASK_SOURCE != 0) {
+                                    $oCriteria->add(AppDelegationPeer::TAS_UID, $TASK_SOURCE);
+                                }
+                            }
+                            $oCriteria->add(AppDelegationPeer::USR_UID, $USER);
+
+                            $oDataset = AppDelegationPeer::doSelectRS($oCriteria);
+                            $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
+                            $oDataset->next();
+
+                            while ($aRow = $oDataset->getRow()) {
+                                if ($TASK_SOURCE == $aRow['TAS_UID']) {
+                                    $delIndex[] = $aRow['DEL_INDEX'];  
+                                }
+                                $oDataset->next();
+                            }
+
+                            $RESULT['MSGS_HISTORY'] = array_merge(array('DEL_INDEX' => $delIndex), $RESULT['MSGS_HISTORY']);
+                        } 
+                        break;
+
                 }
             }
         }
@@ -5349,7 +5386,8 @@ class Cases
             "DYNAFORMS" => $RESULT['DYNAFORM'],
             "INPUT_DOCUMENTS" => $RESULT['INPUT'],
             "OUTPUT_DOCUMENTS" => $RESULT['OUTPUT'],
-            "CASES_NOTES" => $RESULT['CASES_NOTES']
+            "CASES_NOTES" => $RESULT['CASES_NOTES'],
+            "MSGS_HISTORY" => $RESULT['MSGS_HISTORY']
         );
     }
 
@@ -6503,4 +6541,3 @@ class Cases
         return false;
     }
 }
- 

workflow/engine/classes/class.processMap.php

@@ -3621,6 +3621,10 @@ class processMap
                     $sObjectType = G::LoadTranslation('ID_CASES_NOTES');
                     $sObject = 'N/A';
                     break;
+                case 'MSGS_HISTORY':
+                    $sObjectType = G::LoadTranslation('MSGS_HISTORY');
+                    $sObject = G::LoadTranslation('ID_ALL');
+                    break;
                 default:
                     $sObjectType = G::LoadTranslation('ID_ALL');
                     $sObject = G::LoadTranslation('ID_ALL');
@@ -3635,8 +3639,7 @@ class processMap
             //Obtain action (permission)
             $sAction = G::LoadTranslation('ID_' . $aRow['OP_ACTION']);
             //Add to array
-            $aObjectsPermissions[] = array('OP_UID' => $aRow['OP_UID'], 'TASK_TARGET' => $sTaskTarget, 'GROUP_USER' => $sUserGroup, 'TASK_SOURCE' => $sTaskSource, 'OBJECT_TYPE' => $sObjectType, 'OBJECT' => $sObject, 'PARTICIPATED' => $sParticipated, 'ACTION' => $sAction, 'OP_CASE_STATUS' => $aRow['OP_CASE_STATUS']
+            $aObjectsPermissions[] = array('OP_UID' => $aRow['OP_UID'], 'TASK_TARGET' => $sTaskTarget, 'GROUP_USER' => $sUserGroup, 'TASK_SOURCE' => $sTaskSource, 'OBJECT_TYPE' => $sObjectType, 'OBJECT' => $sObject, 'PARTICIPATED' => $sParticipated, 'ACTION' => $sAction, 'OP_CASE_STATUS' => $aRow['OP_CASE_STATUS']);
-            );
             $oDataset->next();
         }
         global $_DBArray;
@@ -3894,7 +3897,11 @@ class processMap
         global $G_PUBLISH;
         $G_PUBLISH = new Publisher();
         $G_PUBLISH->AddContent('xmlform', 'xmlform', 'processes/processes_NewObjectPermission', '',
-                    array('GROUP_USER' => $usersGroups, 'LANG' => SYS_LANG, 'PRO_UID' => $sProcessUID, 'ID_DELETE' => G::LoadTranslation('ID_DELETE')
+            array('GROUP_USER' => $usersGroups,
+                  'LANG' => SYS_LANG,
+                  'PRO_UID' => $sProcessUID,
+                  'ID_DELETE' => G::LoadTranslation('ID_DELETE'),
+                  'ID_RESEND' => G::LoadTranslation('ID_RESEND')
             ), 'processes_SaveObjectPermission');
         G::RenderPage('publish', 'raw');
         return true;
@@ -4048,6 +4055,7 @@ class processMap
 
         $aFields['GROUP_USER'] = $usersGroups;
         $aFields['ID_DELETE'] = G::LoadTranslation('ID_DELETE');
+        $aFields['ID_RESEND'] = G::LoadTranslation('ID_RESEND');
 
         global $G_PUBLISH;
         $G_PUBLISH = new Publisher();

workflow/engine/classes/class.system.php

@@ -965,7 +965,7 @@ class System
                 $res['SKIN_FOLDER_ID'] = strtolower( $folderId );
 
                 foreach ($skinInformationArray as $keyInfo => $infoValue) {
-                    $res['SKIN_' . strtoupper( $keyInfo )] = $infoValue['__VALUE__'];
+                    $res['SKIN_' . strtoupper( $keyInfo )] = (isset($infoValue['__VALUE__'])) ? $infoValue['__VALUE__'] : '';
                 }
                 $res['SKIN_CREATEDATE'] = (isset($res['SKIN_CREATEDATE'])) ? $res['SKIN_CREATEDATE']: '';
                 $res['SKIN_MODIFIEDDATE'] = (isset($res['SKIN_MODIFIEDDATE'])) ? $res['SKIN_MODIFIEDDATE']: '';

workflow/engine/controllers/installer.php

@@ -843,7 +843,7 @@ class Installer extends Controller
 
             $indexFileUpdated = true;
             if (defined('PARTNER_FLAG') || isset($_REQUEST['PARTNER_FLAG'])) {
-                $this->buildParternExtras($adminUsername, $adminPassword, $_REQUEST['workspace'], SYS_LANG);
+                $this->buildParternExtras($adminUsername, $adminPassword, $_REQUEST['workspace'], $langUri);
             } else {
                 try {
                     G::update_php_ini( $envFile, $updatedConf );
@@ -1383,7 +1383,6 @@ EOL;
 
         // File to upload/post
         $postData['form[LANGUAGE_FILENAME]'] = "@".PATH_CORE."content/translations/processmaker.$lang.po";
-
         curl_setopt($ch, CURLOPT_URL, "$serv/sys{$workspace}/{$lang}/classic/setup/languages_Import");
         curl_setopt($ch, CURLOPT_HEADER, 0);
         curl_setopt($ch, CURLOPT_VERBOSE, 0);
@@ -1455,7 +1454,6 @@ EOL;
             curl_setopt($ch, CURLOPT_POSTFIELDS, $postData);
             curl_setopt($ch, CURLOPT_TIMEOUT, 90);
 
-
             $output = curl_exec($ch);
             curl_close($ch);
         }

workflow/engine/methods/cases/caseMessageHistory_Ajax.php

@@ -46,10 +46,41 @@ if ($actionAjax == 'messageHistoryGridList_JXP') {
     $result = new stdClass();
     $aProcesses = Array ();
 
+
+    $proUid	= $_SESSION['PROCESS'];
+    $appUid = $_SESSION['APPLICATION'];
+    $tasUid	= $_SESSION['TASK'];
+    $usrUid = $_SESSION['USER_LOGGED'];
+
+    $respView = $oCase->getAllObjectsFrom( $proUid, $appUid, $tasUid, $usrUid, 'VIEW' );
+    $respBlock = $oCase->getAllObjectsFrom( $proUid, $appUid, $tasUid, $usrUid, 'BLOCK' );
+    $respResend = $oCase->getAllObjectsFrom( $proUid, $appUid, $tasUid, $usrUid, 'RESEND' );
+
+    $delIndex = array();
+    $respMess = "";
+    if (count($respView['MSGS_HISTORY'])>0) {
+        $respMess = $respView['MSGS_HISTORY']['PERMISSION'];
+        $delIndex = $respView['MSGS_HISTORY']['DEL_INDEX'];
+    } else {
+        if (count($respBlock['MSGS_HISTORY'])>0) {
+            $respMess = $respBlock['MSGS_HISTORY']['PERMISSION'];
+            $delIndex = $respView['MSGS_HISTORY']['DEL_INDEX'];
+        } else {
+            if (count($respResend['MSGS_HISTORY'])>0) {
+                $respMess = $respResend['MSGS_HISTORY']['PERMISSION'];
+                $delIndex = $respView['MSGS_HISTORY']['DEL_INDEX'];
+            }
+        }
+    }
+
     foreach ($appMessageArray as $index => $value) {
-        if ($appMessageArray[$index]['APP_MSG_SHOW_MESSAGE'] == 1) {
+        if (($appMessageArray[$index]['APP_MSG_SHOW_MESSAGE'] == 1  && $respMess != 'BLOCK' ) && 
+            ($appMessageArray[$index]['DEL_INDEX'] == 0 || in_array($appMessageArray[$index]['DEL_INDEX'], $delIndex ))) {
             $appMessageArray[$index]['ID_MESSAGE'] = $appMessageArray[$index]['APP_UID'] . '_' . $appMessageArray[$index]['APP_MSG_UID'];
-            $aProcesses[] = $appMessageArray[$index];
+            if ($respMess == 'BLOCK' || $respMess == '') {
+                $appMessageArray[$index]['APP_MSG_BODY'] = "";
+            }
+            $aProcesses[] = array_merge($appMessageArray[$index], array('MSGS_HISTORY' => $respMess));
         }
     }
 

workflow/engine/methods/processes/processes_SaveObjectPermission.php

@@ -42,10 +42,11 @@ if ($access != 1) {
             break;
     }
 }
-if (isset( $_POST['form'] ))
+if (isset( $_POST['form'] )) {
     $sValue = $_POST['form']; //For old processmap
-else
+} else {
     $sValue = $_POST; //For new processmap EXtjs
+}
 
 
 list ($iRelation, $sUserGroup) = explode( '|', $sValue['GROUP_USER'] );
@@ -69,8 +70,7 @@ switch ($sValue['OP_OBJ_TYPE']) {
 }
 require_once 'classes/model/ObjectPermission.php';
 $oOP = new ObjectPermission();
-$aData = array ('OP_UID' => G::generateUniqueID(),'PRO_UID' => $sValue['PRO_UID'],'TAS_UID' => $sValue['TAS_UID'],'USR_UID' => (string) $sUserGroup,'OP_USER_RELATION' => $iRelation,'OP_TASK_SOURCE' => $sValue['OP_TASK_SOURCE'],'OP_PARTICIPATE' => $sValue['OP_PARTICIPATE'],'OP_OBJ_TYPE' => $sValue['OP_OBJ_TYPE'],'OP_OBJ_UID' => $sObjectUID,'OP_ACTION' => $sValue['OP_ACTION'],'OP_CASE_STATUS' => $sValue['OP_CASE_STATUS']
+$aData = array ('OP_UID' => G::generateUniqueID(),'PRO_UID' => $sValue['PRO_UID'],'TAS_UID' => $sValue['TAS_UID'],'USR_UID' => (string) $sUserGroup,'OP_USER_RELATION' => $iRelation,'OP_TASK_SOURCE' => $sValue['OP_TASK_SOURCE'],'OP_PARTICIPATE' => $sValue['OP_PARTICIPATE'],'OP_OBJ_TYPE' => $sValue['OP_OBJ_TYPE'],'OP_OBJ_UID' => $sObjectUID,'OP_ACTION' => $sValue['OP_ACTION'],'OP_CASE_STATUS' => $sValue['OP_CASE_STATUS']);
-);
 $oOP->fromArray( $aData, BasePeer::TYPE_FIELDNAME );
 $oOP->save();
 G::LoadClass( 'processMap' );

workflow/engine/methods/setup/skin_Ajax.php

@@ -56,7 +56,7 @@ function skinList ()
     }
 
     foreach ($skinList['skins'] as $key => $value) {
-        if ($value['SKIN_ID'] != $classicSkin) {
+        if (!isset($value['SKIN_ID']) || $value['SKIN_ID'] != $classicSkin) {
             if ($value['SKIN_FOLDER_ID'] != 'simplified' && $value['SKIN_FOLDER_ID'] != 'uxs' && $value['SKIN_FOLDER_ID'] != 'uxmodern') {
                 if ($skinList['currentSkin'] == $value['SKIN_FOLDER_ID']) {
                     $value['SKIN_STATUS'] = $wildcard . G::LoadTranslation( 'ID_ACTIVE' );

workflow/engine/templates/cases/caseMessageHistory.js

@@ -7,9 +7,7 @@
       window.parent.tabIframeWidthFix2(idIframe);
     }
 
-    previewMessage = function() {
+    function windowPreviewMessage(rowSelected) {
-      var rowSelected =  Ext.getCmp('processesGrid').getSelectionModel().getSelected();
-      if (rowSelected) {
         windowMessage = new Ext.Window({
             title: '',
             width: 600,
@@ -95,6 +93,140 @@
 
         //show windows message
         windowMessage.show(windowMessage);
+
+    }
+
+    function resendDialog(rowSelected) {
+
+        Ext.Msg.show({
+            title:'',
+            msg: _('ID_ARE_YOU_SURE_RESEND')+"?",
+            buttons: Ext.Msg.OKCANCEL,
+            icon: Ext.MessageBox.QUESTION,
+            fn: function(btn, text){
+                if(btn=='ok'){
+                    //!dataGrid
+                    var idMessage = rowSelected.data.ID_MESSAGE;
+                    var subjectMessage = rowSelected.data.APP_MSG_SUBJECT;
+                    var dateMessage = rowSelected.data.APP_MSG_DATE;
+
+                    var tabName = 'sendMailMessage_'+idMessage;
+                    var tabTitle = 'Resend('+subjectMessage+' '+dateMessage+')';
+
+                    ActionTabFrameGlobal.tabName = tabName;
+                    ActionTabFrameGlobal.tabTitle = tabTitle;
+
+                    //window.parent.Actions.tabFrame(tabName);
+                    var tabNameArray = tabName.split('_');
+                    var APP_UID = tabNameArray[1];
+                    var APP_MSG_UID = tabNameArray[2];
+
+                    messageHistoryGridListMask = new Ext.LoadMask(Ext.getBody(), {msg:_('ID_LOADING')});
+                    messageHistoryGridListMask.show();
+
+                    var url = "caseMessageHistory_Ajax.php?actionAjax=sendMailMessage_JXP&APP_UID="+APP_UID+"&APP_MSG_UID="+APP_MSG_UID;
+                    ajaxPostRequest(url,'caseMessageHistory_RSP');
+
+                }
+
+            },
+            animEl: 'elId'
+        });
+    }
+
+
+    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({
@@ -326,7 +458,8 @@ var ActionTabFrameGlobal = '';
               {name : 'APP_MSG_FROM'},
               {name : 'APP_MSG_TO'},
               {name : 'APP_MSG_STATUS'},
-              {name : 'APP_MSG_BODY'}
+              {name : 'APP_MSG_BODY'},
+              {name : 'MSGS_HISTORY'}
 
             ]
           }
@@ -389,7 +522,7 @@ var ActionTabFrameGlobal = '';
         enableHdMenu: true,
         frame:false,
         //plugins: expander,
-        cls : 'grid_with_checkbox',
+        // cls : 'grid_with_checkbox',
         columnLines: true,
         viewConfig: {
           forceFit:true
@@ -408,9 +541,53 @@ var ActionTabFrameGlobal = '';
             {header: _("ID_FROM"), dataIndex: 'APP_MSG_FROM', width: 60, renderer: escapeHtml},
             {header: _("ID_TO"), dataIndex: 'APP_MSG_TO', width: 60, renderer: escapeHtml},
             {header: _("ID_STATUS"), dataIndex: 'APP_MSG_STATUS', width: 50},
-            {header: _("ID_APP_MSG_BODY"), dataIndex: 'APP_MSG_BODY', width: 50,hidden:true}          ]
+            {header: _("ID_APP_MSG_BODY"), dataIndex: 'APP_MSG_BODY', width: 50,hidden:true},
+            {id:'MSGS_HISTORY', dataIndex: 'MSGS_HISTORY', hidden:true, hideable:false},
+            {
+                // header: _("ID_RESEND"),
+                xtype: 'actioncolumn',
+                width: 60,
+                items: [
+                {
+                     getClass: function(v, meta, rec) {
+                         this.items[0].tooltip = _("ID_RESEND");
+                         if (rec.get('MSGS_HISTORY') === 'RESEND') {
+                             return 'button_menu_ext ss_sprite ss_email_attach';
+                         } else {
+                             return 'button_menu_ext ss_sprite ss_lock';
+                         }
+                     },
+                     handler: function(grid, rowIndex, colIndex) {
+                         var rec = store.getAt(rowIndex);
+                         if (rec.get('MSGS_HISTORY') === 'RESEND') {
+                            resendDialog(rec);
+                         }
+                    }
+                },
+                {
+                     getClass: function(v, meta, rec) {
+                         this.items[1].tooltip = _("ID_PREVIEW");
+                         if (rec.get('MSGS_HISTORY') === 'VIEW' || rec.get('MSGS_HISTORY') === 'RESEND') {
+                             return 'button_menu_ext ss_sprite ss_magnifier';
+                         } else {
+                             return 'button_menu_ext ss_sprite ss_cancel';
+                         }
+                     },
+                     handler: function(grid, rowIndex, colIndex) {
+                         var rec = store.getAt(rowIndex);
+                         if (rec.get('MSGS_HISTORY') === 'VIEW' || rec.get('MSGS_HISTORY') === 'RESEND') {
+                             windowPreviewMessage(rec);
+                         }
+                    }
+                }
+
+                ]
+            }
+
+          ]
         }),
         store: store,
+/*
         tbar:[
           {
             text:_("ID_RESEND"),
@@ -422,49 +599,7 @@ var ActionTabFrameGlobal = '';
                 var rowSelected = processesGrid.getSelectionModel().getSelected();
 
                 if( rowSelected ){
-                  //!dataGrid
+                  resendDialog(rowSelected);
-
-
-                  // Show a dialog using config options:
-                  Ext.Msg.show({
-                    title:'',
-                    msg: _('ID_ARE_YOU_SURE_RESEND')+"?",
-                    buttons: Ext.Msg.OKCANCEL,
-                    icon: Ext.MessageBox.QUESTION,
-                    fn: function(btn, text){
-                      if(btn=='ok'){
-                        //!dataGrid
-                        var idMessage = rowSelected.data.ID_MESSAGE;
-                        var subjectMessage = rowSelected.data.APP_MSG_SUBJECT;
-                        var dateMessage = rowSelected.data.APP_MSG_DATE;
-
-                        var tabName = 'sendMailMessage_'+idMessage;
-                        var tabTitle = 'Resend('+subjectMessage+' '+dateMessage+')';
-
-                        ActionTabFrameGlobal.tabName = tabName;
-                        ActionTabFrameGlobal.tabTitle = tabTitle;
-
-                        //window.parent.Actions.tabFrame(tabName);
-                        var tabNameArray = tabName.split('_');
-                        var APP_UID = tabNameArray[1];
-                        var APP_MSG_UID = tabNameArray[2];
-
-
-                        messageHistoryGridListMask = new Ext.LoadMask(Ext.getBody(), {msg:_('ID_LOADING')});
-                        messageHistoryGridListMask.show();
-
-
-
-                        var url = "caseMessageHistory_Ajax.php?actionAjax=sendMailMessage_JXP&APP_UID="+APP_UID+"&APP_MSG_UID="+APP_MSG_UID;
-                        ajaxPostRequest(url,'caseMessageHistory_RSP');
-
-
-                      }
-
-                    },
-                    animEl: 'elId'
-                  });
-
                 }
                 else{
                   Ext.Msg.show({
@@ -479,8 +614,6 @@ var ActionTabFrameGlobal = '';
                   });
                 }
 
-
-
             },
             disabled:false
           },
@@ -497,8 +630,7 @@ var ActionTabFrameGlobal = '';
 
 	          if (rowSelected) {
                 previewMessage();
-	      }
+	          } else {
-	      else {
 		        Ext.Msg.show({
 		          title:'',
 		          msg: _("ID_NO_SELECTION_WARNING"),
@@ -516,6 +648,8 @@ var ActionTabFrameGlobal = '';
             xtype: 'tbfill'
           }
         ],
+*/
+
         bbar: new Ext.PagingToolbar({
           pageSize: 20,
           store: store,
@@ -525,7 +659,7 @@ var ActionTabFrameGlobal = '';
           items:[]
         }),
         listeners: {
-          rowdblclick: previewMessage,
+          // rowdblclick: previewMessage,
           render: function(){
             this.loadMask = new Ext.LoadMask(this.body, {msg:'Loading...'});
             processesGrid.getSelectionModel().on('rowselect', function(){

workflow/engine/xmlform/cases/cases_Scheduler_New.xml

@@ -46,7 +46,7 @@
 </TAS_UID>
 
 <SCH_NAME type="text" maxlength="100" validate="Any" required="1" readonly="0" size="40" mode="edit" mask="" strto="" dependentfields="" defaultvalue="" hint="" formula="" function="" sqlconnection="" savelabel="0">
-<en>Description</en>
+<en>Name</en>
 </SCH_NAME>
 
 <SCH_OPTION type="dropdown" required="1" readonly="0" savelabel="0" mode="edit" options="Array">
@@ -623,6 +623,9 @@ function case_userSchedulerValidate(username, password) {
  */
 
 function validateSchedulerFields(){
+
+getField("SCH_NAME").value = getField("SCH_NAME").value.trim();
+
 var validFields = true;
 var requiredFields = '';
 var badFormatFields = '';

workflow/engine/xmlform/dynaforms/fields/_options.xml

@@ -6,8 +6,5 @@
 <LABEL type="text" size="19">
     <en>Label</en>
 </LABEL>
-<OPTGROUP type="checkbox" value="1" falsevalue="0" defaultvalue="0">
-    <en>Option Group</en>
-</OPTGROUP>
 </dynaForm>
 

workflow/engine/xmlform/dynaforms/fields/_optionsOptGroup.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<dynaForm name="_optionsOptGroup" type="grid" width="100%" editRow="0" insertRow="0">
+<NAME type="text" validate="Field" size="19">
+    <en>Value</en>
+</NAME>
+<LABEL type="text" size="19">
+    <en>Label</en>
+</LABEL>
+<OPTGROUP type="checkbox" value="1" falsevalue="0" defaultvalue="0">
+    <en>Option Group</en>
+</OPTGROUP>
+</dynaForm>
+

workflow/engine/xmlform/dynaforms/fields/dropdown.xml

@@ -73,7 +73,7 @@ select XMLNODE_NAME, XMLNODE_NAME AS NAME FROM dynaForm WHERE XMLNODE_NAME <> @@
   <en>Options</en>
 </PME_SUBTITLE4>
 
-<PME_OPTIONS type="grid" xmlgrid="dynaforms/fields/_options" editRow="" deleteRow="1" insertRow="1" sqlconnection="XMLDB" />
+<PME_OPTIONS type="grid" xmlgrid="dynaforms/fields/_optionsOptGroup" editRow="" deleteRow="1" insertRow="1" sqlconnection="XMLDB" />
 
 <BTN_CANCEL type="button" onclick="cancel();">
   <en>Cancel</en>

workflow/engine/xmlform/processes/processes_EditObjectPermission.xml

@@ -44,6 +44,7 @@
     <option name="INPUT">Input Document</option>
     <option name="OUTPUT">Output Document</option>
     <option name="CASES_NOTES">Cases Notes</option>
+    <option name="MSGS_HISTORY">Messages History</option>
   </en>
 </OP_OBJ_TYPE>
 <ALL type="dropdown" mode="edit" sqlConnection="dbarray">
@@ -65,28 +66,31 @@
   <en>Output Document<option name="">All</option></en>
 </OUTPUTS>
 <OP_ACTION type="dropdown" mode="edit">
-  <en>Permission<option name="VIEW">View</option><option name="BLOCK">Block</option><option name="DELETE">Delete</option></en>
+  <en>Permission
+      <option name="VIEW">View</option>
+      <option name="BLOCK">Block</option>
+      <option name="DELETE">Delete</option>
+      <option name="RESEND">Resend</option>
+  </en>
 </OP_ACTION>
 
 <CREATE type="button" onclick="saveObjectPermission(this.form);">
   <en>Save</en>
 </CREATE>
 <ID_DELETE type="private"/>
+<ID_RESEND type="private"/>
 <JS type="javascript"><![CDATA[
 var aOptions = [];
 var getOptions = function() {
     var oAux = getField('OP_ACTION');
     for (var i = 0; i < oAux.options.length; i++) {
-    if (oAux.options[i].value != 'DELETE') {
+    if (oAux.options[i].value != 'DELETE' && oAux.options[i].value != 'RESEND') {
             aOptions.push({label:oAux.options[i].text, value: oAux.options[i].value});
         }
     }
 };
 var rebuildOptionsWhenLoad = function(sType) {
     var selectedValue = getField('OP_ACTION').value;
-  switch (sType) {
-    case 'INPUT':
-    case 'OUTPUT':
     var oAux = getField('OP_ACTION');
     while (oAux.options.length) {
         oAux.remove(0);
@@ -100,6 +104,10 @@ var rebuildOptionsWhenLoad = function(sType) {
         }
         oAux.options.add(oOption);
     }
+
+    switch (sType) {
+        case 'INPUT':
+        case 'OUTPUT':
             var oOption = document.createElement('OPTION');
             oOption.value = 'DELETE';
             oOption.text = '@#ID_DELETE';
@@ -107,29 +115,23 @@ var rebuildOptionsWhenLoad = function(sType) {
               oOption.selected = true;
             }
             oAux.options.add(oOption);
-    break
+        break;
-    default:
+        case 'MSGS_HISTORY':
-      var oAux = getField('OP_ACTION');
-      while (oAux.options.length) {
-        oAux.remove(0);
-      }
-      for (var i = 0; i < aOptions.length; i++) {
             var oOption = document.createElement('OPTION');
-        oOption.value = aOptions[i].value;
+            oOption.value = 'RESEND';
-        oOption.text = aOptions[i].label;
+            oOption.text = '@#ID_RESEND';
             if (oOption.value == selectedValue) {
               oOption.selected = true;
             }
             oAux.options.add(oOption);
-      }
+        break;
+        default:
         break;
     }
+
     oAux.value = selectedValue;
 };
 var rebuildOptions = function(sType) {
-  switch (sType) {
-    case 'INPUT':
-    case 'OUTPUT':
     var oAux = getField('OP_ACTION');
     while (oAux.options.length) {
         oAux.remove(0);
@@ -140,96 +142,113 @@ var rebuildOptions = function(sType) {
         oOption.text = aOptions[i].label;
         oAux.options.add(oOption);
     }
+
+    switch (sType) {
+        case 'INPUT':
+        case 'OUTPUT':
             var oOption = document.createElement('OPTION');
             oOption.value = 'DELETE';
             oOption.text = '@#ID_DELETE';
             oAux.options.add(oOption);
-    break
+        break;
-    default:
+        case 'MSGS_HISTORY' :
-      var oAux = getField('OP_ACTION');
-      while (oAux.options.length) {
-        oAux.remove(0);
-      }
-      for (var i = 0; i < aOptions.length; i++) {
             var oOption = document.createElement('OPTION');
-        oOption.value = aOptions[i].value;
+            oOption.value = 'RESEND';
-        oOption.text = aOptions[i].label;
+            oOption.text = '@#ID_RESEND';
             oAux.options.add(oOption);
-      }
+        break;
+        default:
         break;
     }
+
 };
-if(getField('OP_OBJ_TYPE').value=='ANY')
+if (getField('OP_OBJ_TYPE').value=='ANY') {
- { hideRowById('ALL' );
+    hideRowById('ALL' );
     hideRowById( 'DYNAFORMS' );
     hideRowById( 'INPUTS' );
     hideRowById( 'OUTPUTS' );
     showRowById( 'OP_ACTION' );
 }
-if(getField('OP_OBJ_TYPE').value=='DYNAFORM')
+if (getField('OP_OBJ_TYPE').value=='DYNAFORM') {
- { hideRowById( 'ALL' );
+    hideRowById( 'ALL' );
     hideRowById( 'INPUTS' );
     hideRowById( 'OUTPUTS' );
     showRowById( 'OP_ACTION' );
 }
-if(getField('OP_OBJ_TYPE').value=='INPUT')
+if (getField('OP_OBJ_TYPE').value=='INPUT') {
- { hideRowById( 'ALL' );
+    hideRowById( 'ALL' );
     hideRowById( 'DYNAFORMS' );
     hideRowById( 'OUTPUTS' );
     showRowById( 'OP_ACTION' );
 }
-if(getField('OP_OBJ_TYPE').value=='OUTPUT')
+if (getField('OP_OBJ_TYPE').value=='OUTPUT') {
- { hideRowById( 'ALL' );
+    hideRowById( 'ALL' );
     hideRowById( 'DYNAFORMS' );
     hideRowById( 'INPUTS' );
     showRowById( 'OP_ACTION' );
 }
-if(getField('OP_OBJ_TYPE').value=='CASES_NOTES')
+if (getField('OP_OBJ_TYPE').value=='CASES_NOTES') {
- { hideRowById( 'ALL' );
+    hideRowById( 'ALL' );
     hideRowById( 'DYNAFORMS' );
     hideRowById( 'INPUTS' );
     hideRowById( 'OUTPUTS' );
     hideRowById( 'OP_ACTION' );
 }
+if (getField('OP_OBJ_TYPE').value=='MSGS_HISTORY') {
+    hideRowById('ALL');
+    hideRowById('DYNAFORMS');
+    hideRowById('INPUTS');
+    hideRowById('OUTPUTS');
+    showRowById('OP_ACTION');
+}
+
 getOptions();
 rebuildOptionsWhenLoad(getField('OP_OBJ_TYPE').value);
 
 leimnud.event.add(document.getElementById('form[OP_OBJ_TYPE]'), 'change', function() {
-	if(getField('OP_OBJ_TYPE').value=='DYNAFORM')
+    if (getField('OP_OBJ_TYPE').value=='DYNAFORM') {
-	 { hideRowById( 'ALL' );
+        hideRowById( 'ALL' );
         hideRowById( 'INPUTS' );
         hideRowById( 'OUTPUTS' );
         showRowById( 'DYNAFORMS' );
         showRowById( 'OP_ACTION' );
     }
-	if(getField('OP_OBJ_TYPE').value=='INPUT')
+    if (getField('OP_OBJ_TYPE').value=='INPUT') {
-	 { hideRowById( 'ALL' );
+        hideRowById( 'ALL' );
         hideRowById( 'DYNAFORMS' );
         hideRowById( 'OUTPUTS' );
         showRowById( 'INPUTS' );
         showRowById( 'OP_ACTION' );
     }
-	if(getField('OP_OBJ_TYPE').value=='OUTPUT')
+    if (getField('OP_OBJ_TYPE').value=='OUTPUT') {
-	 { hideRowById( 'ALL' );
+        hideRowById( 'ALL' );
         hideRowById( 'DYNAFORMS' );
         hideRowById( 'INPUTS' );
         showRowById( 'OUTPUTS' );
         showRowById( 'OP_ACTION' );
     }
-  if(getField('OP_OBJ_TYPE').value=='CASES_NOTES')
+    if (getField('OP_OBJ_TYPE').value=='CASES_NOTES') {
-   { hideRowById( 'ALL' );
+        hideRowById( 'ALL' );
         hideRowById( 'DYNAFORMS' );
         hideRowById( 'INPUTS' );
         hideRowById( 'OUTPUTS' );
         hideRowById( 'OP_ACTION' );
     }
-	if(getField('OP_OBJ_TYPE').value=='ANY')
+    if (getField('OP_OBJ_TYPE').value=='ANY') {
-   { hideRowById('ALL' );
+        hideRowById('ALL' );
         hideRowById( 'DYNAFORMS' );
         hideRowById( 'INPUTS' );
         hideRowById( 'OUTPUTS' );
         showRowById( 'OP_ACTION' );
     }
+    if (getField('OP_OBJ_TYPE').value=='MSGS_HISTORY') {
+        hideRowById('ALL');
+        hideRowById('DYNAFORMS');
+        hideRowById('INPUTS');
+        hideRowById('OUTPUTS');
+        showRowById('OP_ACTION');
+    }
+
     rebuildOptions(getField('OP_OBJ_TYPE').value);
 });
 
@@ -237,14 +256,11 @@ leimnud.event.add(document.getElementById('form[OP_CASE_STATUS]'), 'change', fun
     var target = document.getElementById('form[TAS_UID]');
     var origin = document.getElementById('form[OP_TASK_SOURCE]');
     var participate = document.getElementById('form[OP_PARTICIPATE]');
-  if (document.getElementById('form[OP_CASE_STATUS]').value=='COMPLETED')
+    if (document.getElementById('form[OP_CASE_STATUS]').value=='COMPLETED') {
-  {
         hideRowById(target);
         hideRowById(origin);
         hideRowById(participate);
-  }
+    } else {
-  else
-  {
         showRowById(target);
         showRowById(origin);
         showRowById(participate);

workflow/engine/xmlform/processes/processes_NewObjectPermission.xml

@@ -44,6 +44,7 @@
     <option name="INPUT">Input Document</option>
     <option name="OUTPUT">Output Document</option>
     <option name="CASES_NOTES">Cases Notes</option>
+    <option name="MSGS_HISTORY">Messages History</option>
   </en>
 </OP_OBJ_TYPE>
 <ALL type="dropdown" mode="edit" sqlConnection="dbarray">
@@ -65,7 +66,10 @@
   <en>Output Document<option name="">All</option></en>
 </OUTPUTS>
 <OP_ACTION type="dropdown" mode="edit">
-  <en>Permission<option name="VIEW">View</option><option name="BLOCK">Block</option></en>
+  <en>Permission
+      <option name="VIEW">View</option>
+      <option name="BLOCK">Block</option>
+  </en>
 </OP_ACTION>
 
 <BTN_CANCEL type="button" onclick="cancel();">
@@ -76,6 +80,7 @@
   <en>Create</en>
 </CREATE>
 <ID_DELETE type="private"/>
+<ID_RESEND type="private"/>
 <JS type="javascript"><![CDATA[
 var aOptions = [];
 var getOptions = function() {
@@ -85,9 +90,7 @@ var getOptions = function() {
   }
 };
 var rebuildOptions = function(sType) {
-  switch (sType) {
+
-    case 'INPUT':
-    case 'OUTPUT':
   var oAux = getField('OP_ACTION');
   while (oAux.options.length) {
     oAux.remove(0);
@@ -98,22 +101,22 @@ var rebuildOptions = function(sType) {
     oOption.text = aOptions[i].label;
     oAux.options.add(oOption);
   }
+
+  switch (sType) {
+    case 'INPUT':
+    case 'OUTPUT':
       var oOption = document.createElement('OPTION');
       oOption.value = 'DELETE';
       oOption.text = '@#ID_DELETE';
       oAux.options.add(oOption);
-    break
+    break;
-    default:
+    case 'MSGS_HISTORY' :
-      var oAux = getField('OP_ACTION');
-      while (oAux.options.length) {
-        oAux.remove(0);
-      }
-      for (var i = 0; i < aOptions.length; i++) {
       var oOption = document.createElement('OPTION');
-        oOption.value = aOptions[i].value;
+      oOption.value = 'RESEND';
-        oOption.text = aOptions[i].label;
+      oOption.text = '@#ID_RESEND';
       oAux.options.add(oOption);
-      }
+    break;
+    default:
     break;
   }
 };
@@ -179,6 +182,17 @@ leimnud.event.add(getField('OP_OBJ_TYPE'), 'change', function() {
       hideRowById('OUTPUTS');
       hideRowById('OP_ACTION');
     break;
+    case 'MSGS_HISTORY':
+      getField('ALL').value = '';
+      getField('DYNAFORMS').value = '';
+      getField('INPUTS').value = '';
+      getField('OUTPUTS').value = (getField('OUTPUTS').options[0] ? getField('OUTPUTS').options[0].value : '');
+      hideRowById('ALL');
+      hideRowById('DYNAFORMS');
+      hideRowById('INPUTS');
+      hideRowById('OUTPUTS');
+      showRowById('OP_ACTION');
+    break;
   }
   rebuildOptions(vValue);
 });