Changeset 33 for pro-bachkim-filespace

Timestamp:

Jul 24, 2014 4:24:16 PM (11 years ago)

Author:

dungnv

Message:

 

File:

• pro-bachkim-filespace/sourcecode/api.violet.vn/www/apps/platform/modules/space/actions/actions.class.php (modified) (3 diffs)

pro-bachkim-filespace/sourcecode/api.violet.vn/www/apps/platform/modules/space/actions/actions.class.php

@@ -83 +83 @@
     $userId = $this->getRequestParameter('userid');
     $filter = $this->getRequestParameter('filter');
+    $isGetAll = $this->getRequestParameter('isgetall');
     
     // find parent ID of this category
@@ -96 +97 @@
     // find subcategory of this category
     $c = new Criteria();
-    //$c->add(TblspacecategoryPeer::CAT_PARENT, $this->catId);
+    if ($isGetAll == 1)
+        $c->add(TblspacecategoryPeer::CAT_PARENT, $this->catId);
+    
     $c->add(TblspacecategoryPeer::CAT_USER, $userId);
     $c->addAscendingOrderByColumn(TblspacecategoryPeer::CAT_NAME);
@@ -103 +106 @@
     // find files in this category folder
     $c = new Criteria();
-    //$c->add(TblspacefilePeer::FILE_CATEGORY, $this->catId);
+    if ($isGetAll == 1)
+        $c->add(TblspacefilePeer::FILE_CATEGORY, $this->catId);
     $c->add(TblspacefilePeer::FILE_USER, $userId);
     if ($filter) $c->add(TblspacefilePeer::FILE_TYPE, explode(';', $filter), Criteria::IN);