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

BUG 11084 PMTables list, sorts only by page.

Browse Source 
Was added some validations to make 'PMTables list' sort all pages.
This commit is contained in:
Vera Osokina
2013-04-03 13:12:10 -04:00
parent d5f4190083
commit d9e92bee22
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
workflow/engine/classes/model/AdditionalTables.php
View File

@@ -621,9 +621,9 @@ class AdditionalTables extends BaseAdditionalTables
$rs = $stmt->executeQuery($deleteSql); $rs = $stmt->executeQuery($deleteSql);
// getting the case data // getting the case data
$caseData = unserialize($row['APP_DATA']); $caseData = unserialize($row['APP_DATA']);
$fieldTypes = array(); $fieldTypes = array();
if ($addTabUid != '') { if ($addTabUid != '') {
require_once 'classes/model/Fields.php'; require_once 'classes/model/Fields.php';
$criteriaField = new Criteria('workflow'); $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; $criteriaCount = clone $oCriteria;
$count = AdditionalTablesPeer::doCount($criteriaCount); $count = AdditionalTablesPeer::doCount($criteriaCount);

1
workflow/engine/templates/pmTables/list.js
View File

@@ -194,6 +194,7 @@ Ext.onReady(function(){
store = new Ext.data.GroupingStore( { store = new Ext.data.GroupingStore( {
autoLoad: false, autoLoad: false,
remoteSort: true,
proxy : new Ext.data.HttpProxy({ proxy : new Ext.data.HttpProxy({
url: 'pmTablesProxy/getList' + (PRO_UID? '?pro_uid='+PRO_UID: '') url: 'pmTablesProxy/getList' + (PRO_UID? '?pro_uid='+PRO_UID: '')
}), }),