From e404161a0043a014b960f000eb82e781bd32c057 Mon Sep 17 00:00:00 2001
From: Marco Antonio Nina <marcoantonionina@colosa.com>
Date: Wed, 17 Oct 2012 10:57:57 -0400
Subject: [PATCH] =?UTF-8?q?BUG=209917=20No=20se=20actualiza=20el=20paginad?=
 =?UTF-8?q?o=20en=20el=20file=20manager=20despu=C3=A9..=20SOLVED?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- no was validated files deleted.
- was add validation for files deleted.
---
 workflow/engine/classes/model/AppFolder.php         | 5 ++++-
 workflow/engine/methods/appFolder/appFolderAjax.php | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/workflow/engine/classes/model/AppFolder.php b/workflow/engine/classes/model/AppFolder.php
index e55c6b98f..b5e70efa6 100755
--- a/workflow/engine/classes/model/AppFolder.php
+++ b/workflow/engine/classes/model/AppFolder.php
@@ -203,7 +203,7 @@ if($limit != 0){
     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/InputDocument.php");
     require_once ("classes/model/OutputDocument.php");
@@ -253,6 +253,9 @@ if($limit != 0){
         }
         $oCriteria->add ( AppDocumentPeer::APP_UID, $data, CRITERIA::IN );
     }
+    if ($onlyActive){
+      $oCriteria->add(AppDocumentPeer::APP_DOC_STATUS, 'ACTIVE');
+    }
 
     $oCase->verifyTable ();
 
diff --git a/workflow/engine/methods/appFolder/appFolderAjax.php b/workflow/engine/methods/appFolder/appFolderAjax.php
index fd163c5b4..e2e831e2c 100755
--- a/workflow/engine/methods/appFolder/appFolderAjax.php
+++ b/workflow/engine/methods/appFolder/appFolderAjax.php
@@ -133,7 +133,7 @@ function expandNode()
         global $RBAC;
         $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);
+            $_POST ['node'] == 'NA' ? "" : $_POST ['node'] : $rootFolder, array(), null, null, $limit, $start, $user, true);
         $folderContent=$folderContentObj['documents'];
         $totalDocuments=$folderContentObj['totalDocumentsCount'];
         $totalItems+=count($folderContent);