From d9e92bee222ebfd642619dfaa4c59ac2d45a39a3 Mon Sep 17 00:00:00 2001 From: Vera Osokina Date: Wed, 3 Apr 2013 13:12:10 -0400 Subject: [PATCH] BUG 11084 PMTables list, sorts only by page. Was added some validations to make 'PMTables list' sort all pages. --- workflow/engine/classes/model/AdditionalTables.php | 14 ++++++++++++-- workflow/engine/templates/pmTables/list.js | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/workflow/engine/classes/model/AdditionalTables.php b/workflow/engine/classes/model/AdditionalTables.php index c20e55dbb..7355594dd 100755 --- a/workflow/engine/classes/model/AdditionalTables.php +++ b/workflow/engine/classes/model/AdditionalTables.php @@ -621,9 +621,9 @@ class AdditionalTables extends BaseAdditionalTables $rs = $stmt->executeQuery($deleteSql); // getting the case data $caseData = unserialize($row['APP_DATA']); - + $fieldTypes = array(); - + if ($addTabUid != '') { require_once 'classes/model/Fields.php'; $criteriaField = new Criteria('workflow'); @@ -877,6 +877,16 @@ class AdditionalTables extends BaseAdditionalTables ); } + if (isset($_POST['sort'])) { + if ($_POST['dir'] == 'ASC') { + eval('$oCriteria->addAscendingOrderByColumn(AdditionalTablesPeer::' . $_POST['sort'] . ');'); + } else { + eval('$oCriteria->addDescendingOrderByColumn(AdditionalTablesPeer::' . $_POST['sort'] . ');'); + } + } else { + //$oCriteria->addAscendingOrderByColumn(AdditionalTablesPeer::ADD_TAB_UID); + } + $criteriaCount = clone $oCriteria; $count = AdditionalTablesPeer::doCount($criteriaCount); diff --git a/workflow/engine/templates/pmTables/list.js b/workflow/engine/templates/pmTables/list.js index 6d10e34cc..344125911 100755 --- a/workflow/engine/templates/pmTables/list.js +++ b/workflow/engine/templates/pmTables/list.js @@ -194,6 +194,7 @@ Ext.onReady(function(){ store = new Ext.data.GroupingStore( { autoLoad: false, + remoteSort: true, proxy : new Ext.data.HttpProxy({ url: 'pmTablesProxy/getList' + (PRO_UID? '?pro_uid='+PRO_UID: '') }),