fernando/luos
1
0
Fork 0
Code Releases Activity

Merge pull request #1518 from hector-cortez/BUG-11075

Browse Source 
BUG 11075 Adicion de triggers: UP-DOWN no funciona SOLVED
This commit is contained in:
julceslauhub
2013-04-05 09:43:36 -07:00
parent 0b2d67e85e 35f018d371
commit 1fd6da7bb0
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,6 +63,7 @@ class propelTable
public $query;
public $totPages;
public $totRows;
public $sortable = '1';
//SQL QUERIES
public $criteria;
@@ -329,6 +330,7 @@ class propelTable
$this->style[$r]['showInTable'] = '0';
}
}
//Render headers
$this->colCount = 0;
$this->shownFields = '[';
@@ -338,9 +340,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 ($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;';
}
} else {
$this->style[$r]['href'] = '#';
$this->style[$r]['onsort'] = 'return false;';

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

@@ -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;

2
workflow/engine/xmlform/steps/triggersAfter_List.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<dynaForm sqlConnection="" menu="steps/triggersAfter_Options" width="100%" disableFooter="1" rowsPerPage="100">
<dynaForm sqlConnection="" menu="steps/triggersAfter_Options" width="100%" disableFooter="1" rowsPerPage="100" sortable="0" >
<STEP_UID type="hidden" showInTable="0"/>

2
workflow/engine/xmlform/steps/triggersBefore_List.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<dynaForm sqlConnection="" menu="steps/triggersBefore_Options" width="100%" disableFooter="1" rowsPerPage="100">
<dynaForm sqlConnection="" menu="steps/triggersBefore_Options" width="100%" disableFooter="1" rowsPerPage="100" sortable="0" >
<STEP_UID type="hidden" showInTable="0"/>