fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG 11075 Adicion de triggers: UP-DOWN no funciona SOLVED

Browse Source 
- 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.
This commit is contained in:
Hector Cortez
2013-04-03 16:50:06 -04:00
parent 86b119d267
commit c1cec698b4
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
workflow/engine/classes/class.propelTable.php
View File

@@ -329,6 +329,16 @@ class propelTable
$this->style[$r]['showInTable'] = '0'; $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 //Render headers
$this->colCount = 0; $this->colCount = 0;
$this->shownFields = '['; $this->shownFields = '[';
@@ -338,9 +348,14 @@ class propelTable
$this->tpl->newBlock( "headers" ); $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']] === 'ASC')) ? 'DESC' : 'ASC');
$sortOrder = (((isset( $this->aOrder[$this->fields[$r]['Name']] )) && ($this->aOrder[$this->fields[$r]['Name']] === 'DESC')) ? '' : $sortOrder); $sortOrder = (((isset( $this->aOrder[$this->fields[$r]['Name']] )) && ($this->aOrder[$this->fields[$r]['Name']] === 'DESC')) ? '' : $sortOrder);
if ($this->style[$r]['titleVisibility'] != '0') { 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]['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 { } else {
$this->style[$r]['href'] = '#'; $this->style[$r]['href'] = '#';
$this->style[$r]['onsort'] = 'return false;'; $this->style[$r]['onsort'] = 'return false;';

6
workflow/engine/methods/steps/steps_Ajax.php
View File

@@ -64,11 +64,9 @@ try {
global $G_PUBLISH; global $G_PUBLISH;
$G_PUBLISH = new Publisher(); $G_PUBLISH = new Publisher();
if ($aData['sType'] == 'BEFORE') { 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 { } 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' ); G::RenderPage( 'publish-twocolumns', 'raw' );
break; break;