From c1cec698b4802647f7a42ad4cbe65e4202dc3d5d Mon Sep 17 00:00:00 2001 From: Hector Cortez Date: Wed, 3 Apr 2013 16:50:06 -0400 Subject: [PATCH 1/3] BUG 11075 Adicion de triggers: UP-DOWN no funciona SOLVED MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - En la asignación de triggers a un Step, es difícil poder mover la posición de un trigger (en cualquiera de las opciones: Before, After, Before Assignment, Before Routing,etc)con el Down y Up. - Validation editing of the triggers, for not to order. --- workflow/engine/classes/class.propelTable.php | 17 ++++++++++++++++- workflow/engine/methods/steps/steps_Ajax.php | 6 ++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/workflow/engine/classes/class.propelTable.php b/workflow/engine/classes/class.propelTable.php index 88ea3f400..8892e33cb 100755 --- a/workflow/engine/classes/class.propelTable.php +++ b/workflow/engine/classes/class.propelTable.php @@ -329,6 +329,16 @@ class propelTable $this->style[$r]['showInTable'] = '0'; } } + + // triggers validation table + $tablesName = $this->criteria->getTables(); + $triggerEditTable = false; + foreach ($tablesName as $table) { + if ($table == 'STEP_TRIGGER') { + $triggerEditTable = true; + } + } + //Render headers $this->colCount = 0; $this->shownFields = '['; @@ -338,9 +348,14 @@ class propelTable $this->tpl->newBlock( "headers" ); $sortOrder = (((isset( $this->aOrder[$this->fields[$r]['Name']] )) && ($this->aOrder[$this->fields[$r]['Name']] === 'ASC')) ? 'DESC' : 'ASC'); $sortOrder = (((isset( $this->aOrder[$this->fields[$r]['Name']] )) && ($this->aOrder[$this->fields[$r]['Name']] === 'DESC')) ? '' : $sortOrder); + if ($this->style[$r]['titleVisibility'] != '0') { $this->style[$r]['href'] = $this->ownerPage . '?order=' . ($sortOrder !== '' ? (G::createUID( '', $this->fields[$r]['Name'] ) . '=' . $sortOrder) : '') . '&page=' . $this->currentPage; - $this->style[$r]['onsort'] = $this->id . '.doSort("' . G::createUID( '', $this->fields[$r]['Name'] ) . '" , "' . $sortOrder . '");return false;'; + if ($triggerEditTable) { + $this->style[$r]['onsort'] = $this->id . '.doSort("' . G::createUID( '', $this->fields[$r]['Name'] ) . '" , ""); return false;';; + } else { + $this->style[$r]['onsort'] = $this->id . '.doSort("' . G::createUID( '', $this->fields[$r]['Name'] ) . '" , "' . $sortOrder . '"); return false;'; + } } else { $this->style[$r]['href'] = '#'; $this->style[$r]['onsort'] = 'return false;'; diff --git a/workflow/engine/methods/steps/steps_Ajax.php b/workflow/engine/methods/steps/steps_Ajax.php index 5e7ac29b9..426da7f8f 100755 --- a/workflow/engine/methods/steps/steps_Ajax.php +++ b/workflow/engine/methods/steps/steps_Ajax.php @@ -64,11 +64,9 @@ try { global $G_PUBLISH; $G_PUBLISH = new Publisher(); if ($aData['sType'] == 'BEFORE') { - $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'steps/triggersBefore_List', $oProcessMap->getStepTriggersCriteria( $aData['sStep'], $_SESSION['TASK'], $aData['sType'] ), array ('STEP' => $aData['sStep'] - ) ); + $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'steps/triggersBefore_List', $oProcessMap->getStepTriggersCriteria( $aData['sStep'], $_SESSION['TASK'], $aData['sType'] ), array ('STEP' => $aData['sStep']) ); } else { - $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'steps/triggersAfter_List', $oProcessMap->getStepTriggersCriteria( $aData['sStep'], $_SESSION['TASK'], $aData['sType'] ), array ('STEP' => $aData['sStep'] - ) ); + $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'steps/triggersAfter_List', $oProcessMap->getStepTriggersCriteria( $aData['sStep'], $_SESSION['TASK'], $aData['sType'] ), array ('STEP' => $aData['sStep']) ); } G::RenderPage( 'publish-twocolumns', 'raw' ); break; From 718c7e3929a6d1e1157d59031081bbaad51b3da8 Mon Sep 17 00:00:00 2001 From: Hector Cortez Date: Fri, 5 Apr 2013 10:50:03 -0400 Subject: [PATCH 2/3] BUG 11075 Adicion de triggers: UP-DOWN no funciona SOLVED MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - En la asignación de triggers a un Step, es difícil poder mover la posición de un trigger (en cualquiera de las opciones: Before, After, Before Assignment, Before Routing,etc)con el Down y Up. - Added sortable attribute in propelTable. --- workflow/engine/classes/class.propelTable.php | 12 ++---------- workflow/engine/xmlform/steps/triggersAfter_List.xml | 2 +- .../engine/xmlform/steps/triggersBefore_List.xml | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/workflow/engine/classes/class.propelTable.php b/workflow/engine/classes/class.propelTable.php index 8892e33cb..6fb42368f 100755 --- a/workflow/engine/classes/class.propelTable.php +++ b/workflow/engine/classes/class.propelTable.php @@ -63,6 +63,7 @@ class propelTable public $query; public $totPages; public $totRows; + public $sortable = 'true'; //SQL QUERIES public $criteria; @@ -330,15 +331,6 @@ class propelTable } } - // triggers validation table - $tablesName = $this->criteria->getTables(); - $triggerEditTable = false; - foreach ($tablesName as $table) { - if ($table == 'STEP_TRIGGER') { - $triggerEditTable = true; - } - } - //Render headers $this->colCount = 0; $this->shownFields = '['; @@ -351,7 +343,7 @@ class propelTable if ($this->style[$r]['titleVisibility'] != '0') { $this->style[$r]['href'] = $this->ownerPage . '?order=' . ($sortOrder !== '' ? (G::createUID( '', $this->fields[$r]['Name'] ) . '=' . $sortOrder) : '') . '&page=' . $this->currentPage; - if ($triggerEditTable) { + if ($this->sortable == 'false') { $this->style[$r]['onsort'] = $this->id . '.doSort("' . G::createUID( '', $this->fields[$r]['Name'] ) . '" , ""); return false;';; } else { $this->style[$r]['onsort'] = $this->id . '.doSort("' . G::createUID( '', $this->fields[$r]['Name'] ) . '" , "' . $sortOrder . '"); return false;'; diff --git a/workflow/engine/xmlform/steps/triggersAfter_List.xml b/workflow/engine/xmlform/steps/triggersAfter_List.xml index b86d7508f..499b97907 100755 --- a/workflow/engine/xmlform/steps/triggersAfter_List.xml +++ b/workflow/engine/xmlform/steps/triggersAfter_List.xml @@ -1,5 +1,5 @@ - + diff --git a/workflow/engine/xmlform/steps/triggersBefore_List.xml b/workflow/engine/xmlform/steps/triggersBefore_List.xml index 97a2b88ae..0026f355e 100755 --- a/workflow/engine/xmlform/steps/triggersBefore_List.xml +++ b/workflow/engine/xmlform/steps/triggersBefore_List.xml @@ -1,5 +1,5 @@ - + From 35f018d3716957a628f0afa9ca90e17f0126f3fd Mon Sep 17 00:00:00 2001 From: Hector Cortez Date: Fri, 5 Apr 2013 12:17:52 -0400 Subject: [PATCH 3/3] BUG 11075 Adicion de triggers: UP-DOWN no funciona SOLVED MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - En la asignación de triggers a un Step, es difícil poder mover la posición de un trigger (en cualquiera de las opciones: Before, After, Before Assignment, Before Routing,etc)con el Down y Up. - Added sortable attribute in propelTable. --- workflow/engine/classes/class.propelTable.php | 4 ++-- workflow/engine/xmlform/steps/triggersAfter_List.xml | 2 +- workflow/engine/xmlform/steps/triggersBefore_List.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/workflow/engine/classes/class.propelTable.php b/workflow/engine/classes/class.propelTable.php index 6fb42368f..a50206659 100755 --- a/workflow/engine/classes/class.propelTable.php +++ b/workflow/engine/classes/class.propelTable.php @@ -63,7 +63,7 @@ class propelTable public $query; public $totPages; public $totRows; - public $sortable = 'true'; + public $sortable = '1'; //SQL QUERIES public $criteria; @@ -343,7 +343,7 @@ class propelTable if ($this->style[$r]['titleVisibility'] != '0') { $this->style[$r]['href'] = $this->ownerPage . '?order=' . ($sortOrder !== '' ? (G::createUID( '', $this->fields[$r]['Name'] ) . '=' . $sortOrder) : '') . '&page=' . $this->currentPage; - if ($this->sortable == 'false') { + if ($this->sortable == '0') { $this->style[$r]['onsort'] = $this->id . '.doSort("' . G::createUID( '', $this->fields[$r]['Name'] ) . '" , ""); return false;';; } else { $this->style[$r]['onsort'] = $this->id . '.doSort("' . G::createUID( '', $this->fields[$r]['Name'] ) . '" , "' . $sortOrder . '"); return false;'; diff --git a/workflow/engine/xmlform/steps/triggersAfter_List.xml b/workflow/engine/xmlform/steps/triggersAfter_List.xml index 499b97907..3f99d5f24 100755 --- a/workflow/engine/xmlform/steps/triggersAfter_List.xml +++ b/workflow/engine/xmlform/steps/triggersAfter_List.xml @@ -1,5 +1,5 @@ - + diff --git a/workflow/engine/xmlform/steps/triggersBefore_List.xml b/workflow/engine/xmlform/steps/triggersBefore_List.xml index 0026f355e..47fee95f7 100755 --- a/workflow/engine/xmlform/steps/triggersBefore_List.xml +++ b/workflow/engine/xmlform/steps/triggersBefore_List.xml @@ -1,5 +1,5 @@ - +