fernando/luos
1
0
Fork 0
Code Releases Activity

BUG 0000 "In HOME>Documents pager does not work" SOLVED

Browse Source 
- In HOME>Documents pager does not work
- Fixed, Added total records variable, The pager now work correctly
* Available from version 2.0.46
This commit is contained in:
Victor Saisa Lopez
2012-11-16 13:32:07 -04:00
parent 621c8ebce3
commit 55ee745105
3 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/classes/model/AppFolder.php
View File

@@ -275,6 +275,8 @@ class AppFolder extends BaseAppFolder
$oCriteria->add( AppDocumentPeer::APP_DOC_STATUS, 'ACTIVE' ); $oCriteria->add( AppDocumentPeer::APP_DOC_STATUS, 'ACTIVE' );
} }
$numRecTotal = AppDocumentPeer::doCount($oCriteria);
$oCase->verifyTable(); $oCase->verifyTable();
$oCriteria->addAscendingOrderByColumn( AppDocumentPeer::APP_DOC_INDEX ); $oCriteria->addAscendingOrderByColumn( AppDocumentPeer::APP_DOC_INDEX );
@@ -321,8 +323,10 @@ class AppFolder extends BaseAppFolder
} }
$rs->next(); $rs->next();
} }
$response['totalDocumentsCount'] = count($response['documents']);
return ($response); $response["totalDocumentsCount"] = $numRecTotal;
return $response;
} }
public function getCompleteDocumentInfo ($appUid, $appDocUid, $docVersion, $docUid, $usrId) public function getCompleteDocumentInfo ($appUid, $appDocUid, $docVersion, $docUid, $usrId)

38
workflow/engine/methods/appFolder/appFolderAjax.php
View File

@@ -121,30 +121,40 @@ function expandNode()
$totalDocuments=0; $totalDocuments=0;
if (($_POST['sendWhat'] == "dirs") || ($_POST['sendWhat'] == "both")) { if (($_POST['sendWhat'] == "dirs") || ($_POST['sendWhat'] == "both")) {
$folderListObj = $oPMFolder->getFolderList ($_POST ['node'] != 'root' ? $folderListObj = $oPMFolder->getFolderList(
$_POST ['node'] == 'NA' ? "" : $_POST ['node'] : $rootFolder, $limit, $start); ($_POST["node"] != "root")? (($_POST["node"] == "NA")? "" : $_POST["node"]) : $rootFolder,
//G::pr($folderListObj); $limit,
$start
);
$folderList=$folderListObj['folders']; $folderList=$folderListObj['folders'];
$totalFolders=$folderListObj['totalFoldersCount']; $totalFolders=$folderListObj['totalFoldersCount'];
$totalItems+=count($folderList); $totalItems+=count($folderList);
//G::pr($folderListObj);
} }
if (($_POST['sendWhat'] == "files") || ($_POST['sendWhat'] == "both")) { if (($_POST['sendWhat'] == "files") || ($_POST['sendWhat'] == "both")) {
global $RBAC; global $RBAC;
$user = ($RBAC->userCanAccess('PM_ALLCASES') == 1)? '' : $_SESSION['USER_LOGGED']; $user = ($RBAC->userCanAccess('PM_ALLCASES') == 1)? '' : $_SESSION['USER_LOGGED'];
$folderContentObj = $oPMFolder->getFolderContent ($_POST ['node'] != 'root' ?
$_POST ['node'] == 'NA' ? "" : $_POST ['node'] : $rootFolder, array(), null, null, $limit, $start, $user, true); $folderContentObj = $oPMFolder->getFolderContent(
($_POST["node"] != "root")? (($_POST["node"] == "NA")? "" : $_POST["node"]) : $rootFolder,
array(),
null,
null,
$limit,
$start,
$user,
true
);
$folderContent=$folderContentObj['documents']; $folderContent=$folderContentObj['documents'];
$totalDocuments=$folderContentObj['totalDocumentsCount']; $totalDocuments=$folderContentObj['totalDocumentsCount'];
$totalItems+=count($folderContent); $totalItems+=count($folderContent);
//G::pr($folderContent);
} }
// G::pr($folderList);
//var_dump(isset($folderList));
$processListTree=array(); $processListTree=array();
$tempTree=array(); $tempTree=array();
if (isset($folderList) && sizeof($folderList)>0) { if (isset($folderList) && sizeof($folderList)>0) {
//print'krlos';
//$tempTree=array(); //$tempTree=array();
foreach ($folderList as $key => $obj) { foreach ($folderList as $key => $obj) {
//$tempTree ['all-obj'] = $obj; //$tempTree ['all-obj'] = $obj;
@@ -339,15 +349,15 @@ function expandNode()
$tempTree=array(); $tempTree=array();
} }
} }
//G::pr($processListTree);
if ((isset($_POST['option'])) && ($_POST['option'] == "gridDocuments")) { if ((isset($_POST['option'])) && ($_POST['option'] == "gridDocuments")) {
$processListTreeTemp['totalCount']=$totalFolders+count($processListTree); $processListTreeTemp["totalCount"] = $totalFolders + $totalDocuments;
$processListTreeTemp['msg']='correct reload'; $processListTreeTemp['msg']='correct reload';
$processListTreeTemp['items']=$processListTree; $processListTreeTemp['items']=$processListTree;
$processListTree = $processListTreeTemp; $processListTree = $processListTreeTemp;
} }
//G::pr ($processListTree);die;
print G::json_encode ($processListTree); echo G::json_encode($processListTree);
} }
function openPMFolder() function openPMFolder()

6
workflow/engine/templates/cases/casesDocuments.js
View File

@@ -1093,11 +1093,7 @@ var gridbb = new Ext.PagingToolbar({
lastText : TRANSLATIONS.ID_LAST, lastText : TRANSLATIONS.ID_LAST,
nextText : TRANSLATIONS.ID_NEXT, nextText : TRANSLATIONS.ID_NEXT,
prevText : TRANSLATIONS.ID_PREVIOUS, prevText : TRANSLATIONS.ID_PREVIOUS,
refreshText : TRANSLATIONS.ID_RELOAD, refreshText: TRANSLATIONS.ID_RELOAD
items : [ '-', ' ', ' ', ' ', ' ', ' ', new Ext.ux.StatusBar({
defaultText : TRANSLATIONS.ID_DONE,
id : 'statusPanel'
}) ]
}); });
var grid; var grid;