diff --git a/workflow/engine/classes/class.propelTable.php b/workflow/engine/classes/class.propelTable.php index 88ea3f400..a50206659 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 = '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;'; 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; diff --git a/workflow/engine/xmlform/steps/triggersAfter_List.xml b/workflow/engine/xmlform/steps/triggersAfter_List.xml index b86d7508f..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 97a2b88ae..47fee95f7 100755 --- a/workflow/engine/xmlform/steps/triggersBefore_List.xml +++ b/workflow/engine/xmlform/steps/triggersBefore_List.xml @@ -1,5 +1,5 @@ - +