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

BUG 9917 No se actualiza el paginado en el file manager despué.. SOLVED

Browse Source 
- no was validated files deleted.
- was add validation for files deleted.
This commit is contained in:
Marco Antonio Nina
2012-10-17 10:57:57 -04:00
parent ebf125b227
commit e404161a00
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -203,7 +203,7 @@ if($limit != 0){
return $folderArray; return $folderArray;
} }
function getFolderContent($folderID, $docIdFilter = array(), $keyword = NULL, $searchType = NULL, $limit=0, $start=0, $user='') { function getFolderContent($folderID, $docIdFilter = array(), $keyword = NULL, $searchType = NULL, $limit=0, $start=0, $user='', $onlyActive=false) {
require_once ("classes/model/AppDocument.php"); require_once ("classes/model/AppDocument.php");
require_once ("classes/model/InputDocument.php"); require_once ("classes/model/InputDocument.php");
require_once ("classes/model/OutputDocument.php"); require_once ("classes/model/OutputDocument.php");
@@ -253,6 +253,9 @@ if($limit != 0){
} }
$oCriteria->add ( AppDocumentPeer::APP_UID, $data, CRITERIA::IN ); $oCriteria->add ( AppDocumentPeer::APP_UID, $data, CRITERIA::IN );
} }
if ($onlyActive){
$oCriteria->add(AppDocumentPeer::APP_DOC_STATUS, 'ACTIVE');
}
$oCase->verifyTable (); $oCase->verifyTable ();

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

@@ -133,7 +133,7 @@ function expandNode()
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' ? $folderContentObj = $oPMFolder->getFolderContent ($_POST ['node'] != 'root' ?
$_POST ['node'] == 'NA' ? "" : $_POST ['node'] : $rootFolder, array(), null, null, $limit, $start, $user); $_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);