BUG: refs #0384. Fix Folder::getItemsFiltered() to display shared items

If an item was shared in two different folders that were both being queried
in the same ajax call (such as two top level folders in the same tree), the
item would only be returned for one of the parent folders, not all of them.

Author: zachmullen

core/controllers/BrowseController.php

@@ -253,7 +253,6 @@ public function selectfolderAction()
   /** get getfolders content (ajax function for the treetable) */
   public function getfolderscontentAction()
     {
-    $this->requireAjaxRequest();
     $this->_helper->layout->disableLayout();
     $this->_helper->viewRenderer->setNoRender();
     $folderIds = $this->_getParam('folders');

core/models/pdo/FolderModel.php

@@ -601,50 +601,49 @@ function getItemsFiltered($folder, $userDao = null, $policy = 0)
         }
       }
 
-    $subqueryUser = $this->database->select()
-                      ->setIntegrityCheck(false)
-                      ->from(array('f' => 'item'))
-                      ->join(array('p' => 'itempolicyuser'),
-                            'f.item_id = p.item_id',
-                             array('p.policy'))
-                      ->join(array('i' => 'item2folder'),
-                            $this->database->getDB()->quoteInto('i.folder_id IN (?)', $folderIds).'
-                            AND i.item_id = p.item_id', array('i.folder_id'))
-                      ->where('policy >= ?', $policy)
-                      ->where('user_id = ? ', $userId);
-
-    $subqueryGroup = $this->database->select()
-                    ->setIntegrityCheck(false)
-                    ->from(array('f' => 'item'))
-                    ->join(array('p' => 'itempolicygroup'),
-                          'f.item_id = p.item_id',
-                           array('p.policy'))
-                    ->join(array('i' => 'item2folder'),
-                                $this->database->getDB()->quoteInto('i.folder_id IN (?)', $folderIds).'
-                                AND i.item_id = p.item_id', array('i.folder_id'))
-                    ->where('policy >= ?', $policy)
-                    ->where('( '.$this->database->getDB()->quoteInto('p.group_id = ? ', MIDAS_GROUP_ANONYMOUS_KEY).' OR
-                              p.group_id IN (' .new Zend_Db_Expr(
-                              $this->database->select()
-                                   ->setIntegrityCheck(false)
-                                   ->from(array('u2g' => 'user2group'),
-                                          array('group_id'))
-                                   ->where('u2g.user_id = ?', $userId)
-                                   .'))' ));
-
-
-
-    $sql = $this->database->select()
-            ->union(array($subqueryUser, $subqueryGroup));
-
     if($isAdmin)
       {
       $sql = $this->database->select()
-                      ->setIntegrityCheck(false)
-                      ->from(array('f' => 'item'))
-                      ->join(array('i' => 'item2folder'),
-                            $this->database->getDB()->quoteInto('i.folder_id IN (?)', $folderIds).'
-                            AND i.item_id = f.item_id', array('i.folder_id'));
+                  ->setIntegrityCheck(false)
+                  ->from(array('f' => 'item'))
+                  ->join(array('i' => 'item2folder'),
+                    $this->database->getDB()->quoteInto('i.folder_id IN (?)', $folderIds).'
+                    AND i.item_id = f.item_id', array('i.folder_id'));
+      }
+    else
+      {
+      $subqueryUser = $this->database->select()
+                           ->setIntegrityCheck(false)
+                           ->from(array('f' => 'item'))
+                           ->join(array('p' => 'itempolicyuser'),
+                              'f.item_id = p.item_id',
+                               array('p.policy'))
+                           ->join(array('i' => 'item2folder'),
+                              $this->database->getDB()->quoteInto('i.folder_id IN (?)', $folderIds).'
+                              AND i.item_id = p.item_id', array('i.folder_id'))
+                           ->where('policy >= ?', $policy)
+                           ->where('user_id = ? ', $userId);
+
+      $subqueryGroup = $this->database->select()
+                            ->setIntegrityCheck(false)
+                            ->from(array('f' => 'item'))
+                            ->join(array('p' => 'itempolicygroup'),
+                              'f.item_id = p.item_id',
+                              array('p.policy'))
+                            ->join(array('i' => 'item2folder'),
+                                  $this->database->getDB()->quoteInto('i.folder_id IN (?)', $folderIds).'
+                                  AND i.item_id = p.item_id', array('i.folder_id'))
+                            ->where('policy >= ?', $policy)
+                            ->where('( '.$this->database->getDB()->quoteInto('p.group_id = ? ', MIDAS_GROUP_ANONYMOUS_KEY).' OR
+                                p.group_id IN (' .new Zend_Db_Expr(
+                                $this->database->select()
+                                     ->setIntegrityCheck(false)
+                                     ->from(array('u2g' => 'user2group'),
+                                            array('group_id'))
+                                     ->where('u2g.user_id = ?', $userId)
+                                     .'))' ));
+
+      $sql = $this->database->select()->union(array($subqueryUser, $subqueryGroup));
       }
 
     $rowset = $this->database->fetchAll($sql);
@@ -668,30 +667,22 @@ function getItemsFiltered($folder, $userDao = null, $policy = 0)
       {
       if(isset($policyArray[$row['item_id']]))
         {
-        $tmpDao = $this->initDao('Item', $row);
-        $tmpDao->policy = $policyArray[$row['item_id']];
-        $tmpDao->parent_id = $row['folder_id'];
-
-        /*
-         * The new naming convention makes sure that no two (or more) items have the same name in a folder,
-         * although items can have same name when they are in different subfolders
-         */
-        /*
-        if(isset($listNamesArray[$tmpDao->getName()]))
-          {
-          $listNamesArray[$tmpDao->getName()]++;
-          $tmpDao->setName($tmpDao->getName().' ('.$listNamesArray[$tmpDao->getName()].')');
-          }
-        else
+        $item = $this->initDao('Item', $row);
+        $folders = $item->getFolders();
+
+        foreach($folders as $folder)
           {
-          $listNamesArray[$tmpDao->getName()] = 0;
+          if(in_array($folder->getKey(), $folderIds))
+            {
+            $tmpDao = clone $item;
+            $tmpDao->policy = $policyArray[$row['item_id']];
+            $tmpDao->parent_id = $folder->getKey();
+            $return[] = $tmpDao;
+            }
           }
-         */
-        $return[] = $tmpDao;
         unset($policyArray[$row['item_id']]);
         }
       }
-
     $this->Component->Sortdao->field = 'name';
     $this->Component->Sortdao->order = 'asc';
     usort($return, array($this->Component->Sortdao, 'sortByName'));