From f1f7866f241a004ae73c5b81b06ad9ed993eeedf Mon Sep 17 00:00:00 2001 From: hector Date: Wed, 16 Mar 2011 12:13:44 -0400 Subject: [PATCH 01/14] Adjust in the select 'Parallel by evaluation' --- workflow/engine/methods/patterns/patterns_Ajax.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/workflow/engine/methods/patterns/patterns_Ajax.php b/workflow/engine/methods/patterns/patterns_Ajax.php index a8cb02854..7df68d466 100644 --- a/workflow/engine/methods/patterns/patterns_Ajax.php +++ b/workflow/engine/methods/patterns/patterns_Ajax.php @@ -120,8 +120,10 @@ switch ($aData['action']) { $aFields['ROU_CASE'] = $iKey; $aFields['ROU_TYPE'] = $aData['ROU_TYPE']; $aFields['ROU_CONDITION'] = $aRow['ROU_CONDITION']; - $aFields['ROU_OPTIONAL'] = $aRow['ROU_OPTIONAL']; - $rou_id = $oRoute->create($aFields); + if(isset($aRow['ROU_OPTIONAL']) && trim($aRow['ROU_OPTIONAL'])!='' + && ($aRow['ROU_OPTIONAL']==='TRUE' || $aRow['ROU_OPTIONAL']==='FALSE')) + $aFields['ROU_OPTIONAL'] = $aRow['ROU_OPTIONAL']; + $rou_id = $oRoute->create($aFields); unset($aFields); } break; From 9ec5e37b3180501e1e5f4ecd94186d51287e1205 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 15 Mar 2011 16:02:49 -0400 Subject: [PATCH 02/14] prevent to create default js label dir, if doesn't exist --- workflow/engine/classes/model/Translation.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/workflow/engine/classes/model/Translation.php b/workflow/engine/classes/model/Translation.php index 519540259..e877ba3a9 100644 --- a/workflow/engine/classes/model/Translation.php +++ b/workflow/engine/classes/model/Translation.php @@ -152,6 +152,9 @@ class Translation extends BaseTranslation { if( ! is_dir(dirname($cacheFile)) ) G::mk_dir(dirname($cacheFile)); + + if( ! is_dir(dirname($cacheFileJS)) ) + G::mk_dir(dirname($cacheFileJS)); $f = fopen( $cacheFile , 'w+'); fwrite( $f , " Date: Wed, 16 Mar 2011 17:53:00 -0400 Subject: [PATCH 03/14] BUG 5932: SOLVED, Now routing rule with evaluation have 'End of process' option --- workflow/engine/classes/class.languages.php | 21 ++++++++++++++----- .../engine/methods/setup/languages_Export.php | 15 +++++++++++-- .../patterns_GridParallelByEvaluationType.xml | 13 ++++++------ 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/workflow/engine/classes/class.languages.php b/workflow/engine/classes/class.languages.php index 68df5b0a6..0da354d5c 100644 --- a/workflow/engine/classes/class.languages.php +++ b/workflow/engine/classes/class.languages.php @@ -325,14 +325,17 @@ class languages { } } else if( $updateXml ){ $xmlForm = $context; - $codes = explode('-', $reference); - foreach($codes as $i=>$code){ + //$codes = explode('-', $reference); + /*foreach($codes as $i=>$code){ $codes[$i] = trim($code); if ( $codes[$i] == "''" ){ $codes[$i] = ''; } } - $fieldName = trim($codes[1]); + $fieldName = trim($codes[1]);*/ + + //erik: expresion to prevent and hable correctly dropdown values like -1, -2 etc. + preg_match('/^([\w_]+)\s-\s([\w_]+)\s*-*\s*([\w\W]*)$/', $reference, $match); if( ! file_exists(PATH_XMLFORM . $xmlForm) ) { continue; @@ -340,11 +343,19 @@ class languages { G::LoadSystem('dynaformhandler'); $dynaform = new dynaFormHandler(PATH_XMLFORM . $xmlForm); + $fieldName = $match[2]; + if( !isset($match[2]) ){ + print_r($reference); + print_r($match); + die; + } + + $codes = explode('-', $reference); if( sizeof($codes) == 2 ) { //is a normal node $dynaform->addChilds($fieldName, Array($LOCALE=>$rowTranslation['msgstr'])); - } else if( sizeof($codes) == 3 ) { //is a node child for a language node - $name = trim($codes[2]); + } else if( sizeof($codes) > 2 ) { //is a node child for a language node + $name = $match[3] == "''" ? '' : $match[3]; $childNode = Array( Array('name'=>'option', 'value'=>$rowTranslation['msgstr'], 'attributes'=>Array('name'=>$name)) ); diff --git a/workflow/engine/methods/setup/languages_Export.php b/workflow/engine/methods/setup/languages_Export.php index d8ab800ce..03b069858 100644 --- a/workflow/engine/methods/setup/languages_Export.php +++ b/workflow/engine/methods/setup/languages_Export.php @@ -173,7 +173,7 @@ foreach ($aXMLForms as $xmlFormPath) { //get all fields of each xmlform foreach ($dynaNodes as $oNode) { - + $sNodeName = $oNode->nodeName; //$arrayNode = $dynaForm->getArray($oNode, Array('type', $_BASE_LANG, $_BASE_LANG)); $arrayNode = $dynaForm->getArray($oNode); @@ -190,6 +190,11 @@ foreach ($aXMLForms as $xmlFormPath) { $langNode = $arrayNode[$_BASE_LANG][0]; $originNodeText = getTextValue($langNode); } + + /*if( strpos($xmlFormPath, 'patterns/patterns_GridParallelByEvaluationType.xml') !== false){ + g::pr($arrayNode); + g::dump(getTextValue($langNode)); + }*/ // Getting the Base Target Text if( isset($arrayNode[$_TARGET_LANG]) ) { @@ -214,13 +219,19 @@ foreach ($aXMLForms as $xmlFormPath) { // if the nodeName already exists in the po file, we need to create other msgid if( isset($aMsgids[$msgid]) ) - $msgid = '[' . $xmlFormFile . '?' . $nodeName . ']' . $originNodeText; + $msgid = '[' . $xmlFormFile . '?' . $nodeName . '] ' . $originNodeText; $poFile->addTranslatorComment($xmlFormFile . '?' . $nodeName); $poFile->addTranslatorComment($xmlFormFile); $poFile->addReference($nodeType . ' - ' . $nodeName); $poFile->addTranslation($msgid, stripslashes($targetNodeText)); + /*if( strpos($xmlFormPath, 'patterns/patterns_GridParallelByEvaluationType.xml') !== false){ + echo 'msgstr: ' .$msgid, stripslashes($targetNodeText); + echo '
'; + }*/ + + $aMsgids[$msgid] = true; //if this node has options child nodes diff --git a/workflow/engine/xmlform/patterns/patterns_GridParallelByEvaluationType.xml b/workflow/engine/xmlform/patterns/patterns_GridParallelByEvaluationType.xml index 0a18937a1..310be26f8 100644 --- a/workflow/engine/xmlform/patterns/patterns_GridParallelByEvaluationType.xml +++ b/workflow/engine/xmlform/patterns/patterns_GridParallelByEvaluationType.xml @@ -1,13 +1,14 @@ - - Next Task - + + + Next Task + + + - Condition + Condition From aa7809ec8d564b8c48e98f9f664cc3f828041d8f Mon Sep 17 00:00:00 2001 From: hector Date: Wed, 16 Mar 2011 12:13:44 -0400 Subject: [PATCH 04/14] Adjust in the select 'Parallel by evaluation' --- workflow/engine/methods/patterns/patterns_Ajax.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/workflow/engine/methods/patterns/patterns_Ajax.php b/workflow/engine/methods/patterns/patterns_Ajax.php index a8cb02854..7df68d466 100644 --- a/workflow/engine/methods/patterns/patterns_Ajax.php +++ b/workflow/engine/methods/patterns/patterns_Ajax.php @@ -120,8 +120,10 @@ switch ($aData['action']) { $aFields['ROU_CASE'] = $iKey; $aFields['ROU_TYPE'] = $aData['ROU_TYPE']; $aFields['ROU_CONDITION'] = $aRow['ROU_CONDITION']; - $aFields['ROU_OPTIONAL'] = $aRow['ROU_OPTIONAL']; - $rou_id = $oRoute->create($aFields); + if(isset($aRow['ROU_OPTIONAL']) && trim($aRow['ROU_OPTIONAL'])!='' + && ($aRow['ROU_OPTIONAL']==='TRUE' || $aRow['ROU_OPTIONAL']==='FALSE')) + $aFields['ROU_OPTIONAL'] = $aRow['ROU_OPTIONAL']; + $rou_id = $oRoute->create($aFields); unset($aFields); } break; From 9becc3b5aa53e42e124de80014aa7db869e328a9 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 15 Mar 2011 16:02:49 -0400 Subject: [PATCH 05/14] prevent to create default js label dir, if doesn't exist --- workflow/engine/classes/model/Translation.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/workflow/engine/classes/model/Translation.php b/workflow/engine/classes/model/Translation.php index 519540259..e877ba3a9 100644 --- a/workflow/engine/classes/model/Translation.php +++ b/workflow/engine/classes/model/Translation.php @@ -152,6 +152,9 @@ class Translation extends BaseTranslation { if( ! is_dir(dirname($cacheFile)) ) G::mk_dir(dirname($cacheFile)); + + if( ! is_dir(dirname($cacheFileJS)) ) + G::mk_dir(dirname($cacheFileJS)); $f = fopen( $cacheFile , 'w+'); fwrite( $f , " Date: Wed, 16 Mar 2011 17:53:00 -0400 Subject: [PATCH 06/14] BUG 5932: SOLVED, Now routing rule with evaluation have 'End of process' option --- workflow/engine/classes/class.languages.php | 21 ++++++++++++++----- .../engine/methods/setup/languages_Export.php | 15 +++++++++++-- .../patterns_GridParallelByEvaluationType.xml | 13 ++++++------ 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/workflow/engine/classes/class.languages.php b/workflow/engine/classes/class.languages.php index 68df5b0a6..0da354d5c 100644 --- a/workflow/engine/classes/class.languages.php +++ b/workflow/engine/classes/class.languages.php @@ -325,14 +325,17 @@ class languages { } } else if( $updateXml ){ $xmlForm = $context; - $codes = explode('-', $reference); - foreach($codes as $i=>$code){ + //$codes = explode('-', $reference); + /*foreach($codes as $i=>$code){ $codes[$i] = trim($code); if ( $codes[$i] == "''" ){ $codes[$i] = ''; } } - $fieldName = trim($codes[1]); + $fieldName = trim($codes[1]);*/ + + //erik: expresion to prevent and hable correctly dropdown values like -1, -2 etc. + preg_match('/^([\w_]+)\s-\s([\w_]+)\s*-*\s*([\w\W]*)$/', $reference, $match); if( ! file_exists(PATH_XMLFORM . $xmlForm) ) { continue; @@ -340,11 +343,19 @@ class languages { G::LoadSystem('dynaformhandler'); $dynaform = new dynaFormHandler(PATH_XMLFORM . $xmlForm); + $fieldName = $match[2]; + if( !isset($match[2]) ){ + print_r($reference); + print_r($match); + die; + } + + $codes = explode('-', $reference); if( sizeof($codes) == 2 ) { //is a normal node $dynaform->addChilds($fieldName, Array($LOCALE=>$rowTranslation['msgstr'])); - } else if( sizeof($codes) == 3 ) { //is a node child for a language node - $name = trim($codes[2]); + } else if( sizeof($codes) > 2 ) { //is a node child for a language node + $name = $match[3] == "''" ? '' : $match[3]; $childNode = Array( Array('name'=>'option', 'value'=>$rowTranslation['msgstr'], 'attributes'=>Array('name'=>$name)) ); diff --git a/workflow/engine/methods/setup/languages_Export.php b/workflow/engine/methods/setup/languages_Export.php index d8ab800ce..03b069858 100644 --- a/workflow/engine/methods/setup/languages_Export.php +++ b/workflow/engine/methods/setup/languages_Export.php @@ -173,7 +173,7 @@ foreach ($aXMLForms as $xmlFormPath) { //get all fields of each xmlform foreach ($dynaNodes as $oNode) { - + $sNodeName = $oNode->nodeName; //$arrayNode = $dynaForm->getArray($oNode, Array('type', $_BASE_LANG, $_BASE_LANG)); $arrayNode = $dynaForm->getArray($oNode); @@ -190,6 +190,11 @@ foreach ($aXMLForms as $xmlFormPath) { $langNode = $arrayNode[$_BASE_LANG][0]; $originNodeText = getTextValue($langNode); } + + /*if( strpos($xmlFormPath, 'patterns/patterns_GridParallelByEvaluationType.xml') !== false){ + g::pr($arrayNode); + g::dump(getTextValue($langNode)); + }*/ // Getting the Base Target Text if( isset($arrayNode[$_TARGET_LANG]) ) { @@ -214,13 +219,19 @@ foreach ($aXMLForms as $xmlFormPath) { // if the nodeName already exists in the po file, we need to create other msgid if( isset($aMsgids[$msgid]) ) - $msgid = '[' . $xmlFormFile . '?' . $nodeName . ']' . $originNodeText; + $msgid = '[' . $xmlFormFile . '?' . $nodeName . '] ' . $originNodeText; $poFile->addTranslatorComment($xmlFormFile . '?' . $nodeName); $poFile->addTranslatorComment($xmlFormFile); $poFile->addReference($nodeType . ' - ' . $nodeName); $poFile->addTranslation($msgid, stripslashes($targetNodeText)); + /*if( strpos($xmlFormPath, 'patterns/patterns_GridParallelByEvaluationType.xml') !== false){ + echo 'msgstr: ' .$msgid, stripslashes($targetNodeText); + echo '
'; + }*/ + + $aMsgids[$msgid] = true; //if this node has options child nodes diff --git a/workflow/engine/xmlform/patterns/patterns_GridParallelByEvaluationType.xml b/workflow/engine/xmlform/patterns/patterns_GridParallelByEvaluationType.xml index 0a18937a1..310be26f8 100644 --- a/workflow/engine/xmlform/patterns/patterns_GridParallelByEvaluationType.xml +++ b/workflow/engine/xmlform/patterns/patterns_GridParallelByEvaluationType.xml @@ -1,13 +1,14 @@ - - Next Task - + + + Next Task + + + - Condition + Condition From 0daa3254a089a9363f7eb0ef89dec65ae530c498 Mon Sep 17 00:00:00 2001 From: Alexandre Rosenfeld Date: Thu, 17 Mar 2011 12:30:57 -0400 Subject: [PATCH 07/14] Adjustment to establish mode the Grids Tables, and elements (validation) Conflicts: gulliver/system/class.xmlform.php --- gulliver/system/class.xmlform.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php index 163783d0b..890ebd51f 100644 --- a/gulliver/system/class.xmlform.php +++ b/gulliver/system/class.xmlform.php @@ -2397,9 +2397,14 @@ class XmlForm_Field_Dropdown extends XmlForm_Field { { $result = array (); $r = 1; +<<<<<<< HEAD if(! isset($owner->modeGrid)) $owner->modeGrid = ''; $this->modeGridDrop = $owner->modeGrid; +======= + if(isset($owner->modeGrid)) + $this->modeGridDrop = $owner->modeGrid; +>>>>>>> 63d86b9... Adjustment to establish mode the Grids Tables, and elements (validation) $this->mode = $this->modeForGrid; foreach ( $values as $v ) { $result [] = $this->render ( $v, $owner, '[' . $owner->name . '][' . $r . ']', $onlyValue, $r, $therow ); From 190619a3f9c157deed675339e85704b6294e183f Mon Sep 17 00:00:00 2001 From: Alexandre Rosenfeld Date: Thu, 17 Mar 2011 12:36:21 -0400 Subject: [PATCH 08/14] Fixing issues with last merge --- gulliver/system/class.xmlform.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/gulliver/system/class.xmlform.php b/gulliver/system/class.xmlform.php index 890ebd51f..163783d0b 100644 --- a/gulliver/system/class.xmlform.php +++ b/gulliver/system/class.xmlform.php @@ -2397,14 +2397,9 @@ class XmlForm_Field_Dropdown extends XmlForm_Field { { $result = array (); $r = 1; -<<<<<<< HEAD if(! isset($owner->modeGrid)) $owner->modeGrid = ''; $this->modeGridDrop = $owner->modeGrid; -======= - if(isset($owner->modeGrid)) - $this->modeGridDrop = $owner->modeGrid; ->>>>>>> 63d86b9... Adjustment to establish mode the Grids Tables, and elements (validation) $this->mode = $this->modeForGrid; foreach ( $values as $v ) { $result [] = $this->render ( $v, $owner, '[' . $owner->name . '][' . $r . ']', $onlyValue, $r, $therow ); From 2149c73433b7064e95eeb4349c4eecf1279abe98 Mon Sep 17 00:00:00 2001 From: erik Date: Thu, 17 Mar 2011 15:32:01 -0400 Subject: [PATCH 09/14] BUG 6451: SOLVED, for new started cases, now is displaying the case title on the tab title --- workflow/engine/methods/cases/open.php | 7 ++++ workflow/engine/templates/cases/open.js | 44 ++----------------------- 2 files changed, 10 insertions(+), 41 deletions(-) diff --git a/workflow/engine/methods/cases/open.php b/workflow/engine/methods/cases/open.php index be458f412..2051da697 100755 --- a/workflow/engine/methods/cases/open.php +++ b/workflow/engine/methods/cases/open.php @@ -38,6 +38,12 @@ G::LoadClass("configuration"); G::LoadClass("case"); + $oCase = new Cases(); + $appNum = ''; + if( isset($_GET['APP_UID']) && isset($_GET['DEL_INDEX'])) { + $case = $oCase->loadCase($_GET['APP_UID'], $_GET['DEL_INDEX']); + $appNum = $case['APP_TITLE']; + } $conf = new Configurations; if (!isset($_GET['to_revise'])){ @@ -54,6 +60,7 @@ } $oHeadPublisher->assign('uri', $script . $uri); + $oHeadPublisher->assign('_APP_NUM', $appNum); $oHeadPublisher->assign('_ENV_CURRENT_DATE', $conf->getSystemDate(date('Y-m-d'))); G::RenderPage('publish', 'extJs'); diff --git a/workflow/engine/templates/cases/open.js b/workflow/engine/templates/cases/open.js index 4a90346f2..e69b89182 100755 --- a/workflow/engine/templates/cases/open.js +++ b/workflow/engine/templates/cases/open.js @@ -1,18 +1,3 @@ -/*new Ext.KeyMap(document, { - key: Ext.EventObject.F5, - fn: function(keycode, e) { - if (! e.ctrlKey) { - if (Ext.isIE) { - e.browserEvent.keyCode = 8; - } - e.stopEvent(); - updateCasesTree(); - } - else - Ext.Msg.alert('Refresh', 'You clicked: CTRL-F5'); - } -});*/ - var Actions = {}; var showCaseNavigatorPanel; var hideCaseNavigatorPanel; @@ -20,16 +5,11 @@ var informationMenu; var caseMenuOpen = false; var toReviseTreeOpen = false; var menuSelectedTitle = Array(); - var _ENV_CURRENT_DATE; Ext.onReady(function(){ - - Ext.QuickTips.init(); - - showCaseNavigatorPanel = function(steps, information, action) { if(steps==false&&action==false){ @@ -81,8 +61,6 @@ Ext.onReady(function(){ return false; else caseMenuOpen = true; - - //alert(steps+' '+information+' '+action); //getting the case Information availables options Ext.Ajax.request({ @@ -155,13 +133,11 @@ Ext.onReady(function(){ function togglePreview(btn, pressed){ var preview = Ext.getCmp('navPanelWest'); preview[pressed ? 'show' : 'hide'](); - //preview.ownerCt.doLayout(); Ext.getCmp('navPanel').ownerCt.doLayout(); } var casesStepTree = new Ext.tree.TreePanel({ id: 'casesStepTree', - //title: 'Reporting Project', autoWidth: true, userArrows: true, animate: true, @@ -191,16 +167,11 @@ Ext.onReady(function(){ id: 'navPanelWest', region: 'west', xtype:'panel', - //deferredRender: false, - //contentEl:'casesSubFrame' - //layout: 'border', width: 250, height: 500, - //minSize: 175, maxSize: 400, split: true, collapsible: false, -// collapseMode: 'mini', margins: '0 0 0 0', items:[casesStepTree] } @@ -215,9 +186,6 @@ Ext.onReady(function(){ id: 'navPanelCenter', region: 'center', xtype:'panel', - //html:'addd' - //deferredRender: true - //contentEl:'openCaseFrame' items:[{ xtype:"tabpanel", id: 'caseTabPanel', @@ -229,7 +197,7 @@ Ext.onReady(function(){ //defaults: Ext.apply({}, Ext.isGecko? {style:{position:'absolute'},hideMode:'visibility'}:false), items:[{ - title: _('ID_CASE') +' ' + parent._CASE_TITLE, + title: _('ID_CASE') +' ' + _APP_NUM, frameConfig:{name:'openCaseFrame', id:'openCaseFrame'}, defaultSrc : uri, loadMask:{msg:'Loading...'}, @@ -264,11 +232,7 @@ Ext.onReady(function(){ var navPanel = { id: 'navPanel', region: 'center', - //xtype:'border', - //deferredRender: false, - //contentEl:'casesSubFrame' layout: 'border', - items:[navPanelWest, navPanelCenter], tbar:[{ id: 'stepsMenu', @@ -284,14 +248,12 @@ Ext.onReady(function(){ }, { id: 'informationMenu', text: _('ID_INFORMATION'), - menu: []//, - //disabled: false + menu: [] }, { id: 'actionMenu', text: _('ID_ACTIONS'), menu: [] - }] - //html:'sds' + }] } var viewport = new Ext.Viewport({ From 1c907807f0e2c2aad22793d2a9f6f9b0f6d1dbfd Mon Sep 17 00:00:00 2001 From: gustavo Date: Thu, 17 Mar 2011 15:46:03 -0400 Subject: [PATCH 10/14] Fix to the bug related to sql queries inside form fields with sigle quotes --- workflow/engine/methods/dynaforms/fields_Save.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) mode change 100644 => 100755 workflow/engine/methods/dynaforms/fields_Save.php diff --git a/workflow/engine/methods/dynaforms/fields_Save.php b/workflow/engine/methods/dynaforms/fields_Save.php old mode 100644 new mode 100755 index 3af2f4184..ea68b47fe --- a/workflow/engine/methods/dynaforms/fields_Save.php +++ b/workflow/engine/methods/dynaforms/fields_Save.php @@ -74,6 +74,9 @@ if (($RBAC_Response=$RBAC->userCanAccess("PM_FACTORY"))!=1) return $RBAC_Respons define('DB_XMLDB_NAME',''); define('DB_XMLDB_TYPE','myxml'); + if (isset($_POST['form']['PME_XMLNODE_VALUE'])){ + $_POST['form']['PME_XMLNODE_VALUE'] = str_replace("'", "\"" , $_POST['form']['PME_XMLNODE_VALUE']); + } if (file_exists( PATH_XMLFORM . 'dynaforms/fields/' . $type . '.xml')) { $form=new Form('dynaforms/fields/' . $type , PATH_XMLFORM); @@ -201,4 +204,4 @@ if (($RBAC_Response=$RBAC->userCanAccess("PM_FACTORY"))!=1) return $RBAC_Respons global $_DBArray; $_DBArray['fields'] = $aFields; $_SESSION['_DBArray'] = $_DBArray; -?> \ No newline at end of file +?> From 5fb7637f4f09071d18270a3edd46bdd08d84c9ef Mon Sep 17 00:00:00 2001 From: Enrique Date: Fri, 18 Mar 2011 16:34:34 -0400 Subject: [PATCH 11/14] add html2ps_pdf cache folder to .gitignore file --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 2c8f5af7d..c6646b9ad 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ nbproject workflow/engine/config/paths_installed.php +gulliver/thirdparty/html2ps_pdf/cache *~ From ee77fa84fcb4a9be295cf03498a5907a61ca185f Mon Sep 17 00:00:00 2001 From: Enrique Date: Fri, 18 Mar 2011 17:40:07 -0400 Subject: [PATCH 12/14] skins label update --- workflow/engine/templates/setup/skinList.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/engine/templates/setup/skinList.js b/workflow/engine/templates/setup/skinList.js index 94a8a7e25..bcd3cab89 100755 --- a/workflow/engine/templates/setup/skinList.js +++ b/workflow/engine/templates/setup/skinList.js @@ -224,8 +224,8 @@ Ext.onReady(function(){ pageSize: pageSize, store: store, displayInfo: true, - displayMsg: _('ID_GRID_PAGE_DISPLAYING_CALENDAR_MESSAGE') + '    ', - emptyMsg: _('ID_GRID_PAGE_NO_CALENDAR_MESSAGE')//, + displayMsg: _('ID_GRID_PAGE_DISPLAYING_SKIN_MESSAGE') + '    ', + emptyMsg: _('ID_GRID_PAGE_NO_SKIN_MESSAGE')//, //items: ['-',_('ID_PAGE_SIZE')+':',comboPageSize] }); From d3b7fae8c4345ec75d11f49282158dca5061494d Mon Sep 17 00:00:00 2001 From: gustavo Date: Fri, 18 Mar 2011 18:58:52 -0400 Subject: [PATCH 13/14] Fix to the selfservice open case ajax action --- workflow/engine/methods/cases/ajaxListener.php | 6 +++--- workflow/engine/templates/cases/open.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/workflow/engine/methods/cases/ajaxListener.php b/workflow/engine/methods/cases/ajaxListener.php index b87df05c3..eea2073c8 100755 --- a/workflow/engine/methods/cases/ajaxListener.php +++ b/workflow/engine/methods/cases/ajaxListener.php @@ -55,9 +55,9 @@ class Ajax G::LoadClass('pmScript'); G::LoadClass('case'); - $PRO_UID = $_SESSION['PROCESS']; - $TAS_UID = $_SESSION['TASK']; - $APP_UID = $_SESSION['APPLICATION']; + $PRO_UID = isset($_SESSION['PROCESS'])?$_SESSION['PROCESS']:''; + $TAS_UID = isset($_SESSION['TASK'])?$_SESSION['TASK']:''; + $APP_UID = isset($_SESSION['APPLICATION'])?$_SESSION['APPLICATION']:''; $tree = Array(); $case = new Cases; $step = new Step; diff --git a/workflow/engine/templates/cases/open.js b/workflow/engine/templates/cases/open.js index e69b89182..fe55b7642 100755 --- a/workflow/engine/templates/cases/open.js +++ b/workflow/engine/templates/cases/open.js @@ -12,7 +12,7 @@ Ext.onReady(function(){ Ext.QuickTips.init(); showCaseNavigatorPanel = function(steps, information, action) { - if(steps==false&&action==false){ + if(steps==false&&action==false&&typeof(treeToReviseTitle)!='undefined'){ var treeToRevise = new Ext.tree.TreePanel({ title: treeToReviseTitle, width: 250, From 856e7987c09bf9eaf0692fb3e653e62a9108dbfe Mon Sep 17 00:00:00 2001 From: Enrique Date: Fri, 18 Mar 2011 19:13:43 -0400 Subject: [PATCH 14/14] case scheduler fix creation problem --- workflow/engine/methods/cases/cases_Scheduler_Save.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/workflow/engine/methods/cases/cases_Scheduler_Save.php b/workflow/engine/methods/cases/cases_Scheduler_Save.php index e261d9b50..48c621119 100644 --- a/workflow/engine/methods/cases/cases_Scheduler_Save.php +++ b/workflow/engine/methods/cases/cases_Scheduler_Save.php @@ -231,20 +231,23 @@ try { //Added by Qennix //Update Start Time Event in BPMN + + + if (isset($_POST['form']['TAS_UID'])){ require_once 'classes/model/Event.php'; require_once 'classes/model/Task.php'; + $oTask = new Task(); $oTask->load($_POST['form']['TAS_UID']); - echo '1'; $evn_uid = $oTask->getStartingEvent(); - echo '2'.$evn_uid; $event = new Event(); $editEvent = array(); $editEvent['EVN_UID'] = $evn_uid; $editEvent['EVN_ACTION'] = $sch_uid; $event->update($editEvent); //End Adding + } G::header('location: cases_Scheduler_List?PRO_UID='.$_POST['form']['PRO_UID']);