BUG: fixed bug #142 Folders and items shouldn t have the same name and same parent

Author: Charles Ma

core/controllers/FolderController.php

@@ -54,6 +54,13 @@ function editAction()
     if($this->_request->isPost())
       {
       $name = $this->_getParam('name');
+      
+      // Check ifa folder with the same name already exists for the same parent
+      if($this->Folder->getFolderExists($name, $folder->getParent()))
+        {
+        throw new Zend_Exception('This name is already used');
+        }
+    
       $description = $this->_getParam('description');
       $teaser = $this->_getParam('teaser');
 

core/models/base/FolderModelBase.php

@@ -54,7 +54,7 @@ abstract function addItem($folder, $item);
   abstract function move($folder, $parent);
   abstract function removeItem($folder, $item);
   abstract function policyCheck($folderDao, $userDao = null, $policy = 0);
-  abstract function getFolderExists($name, $description);
+  abstract function getFolderExists($name, $parent);
   abstract function getByUuid($uuid);
   abstract function getRoot($folder);
 
@@ -109,9 +109,9 @@ function createFolder($name, $description, $parent)
       }  
 
     // Check ifa folder with the same name already exists for the same parent
-    if($this->getFolderExists($name, $parentId))
+    if($this->getFolderExists($name, $parent))
       {
-      $existingfolder = $this->getFolderExists($name, $parentId);
+      $existingfolder = $this->getFolderExists($name, $parent);
       return $existingfolder;
       }
 

core/models/pdo/FolderModel.php

@@ -372,6 +372,12 @@ public function move($folder, $parent)
       {
       throw new Zend_Exception("Error parameter.");
       }
+      
+    // Check ifa folder with the same name already exists for the same parent
+    if($this->getFolderExists($folder->getName(), $parent))
+      {
+      throw new Zend_Exception('This name is already used');
+      }
 
     $node_id = $folder->getKey();
     $node_pos_left = $folder->getLeftIndice();
@@ -516,13 +522,13 @@ function getUser($folder)
     }
 
   /** Returns ifa folder exists based on the name and description */
-  function getFolderExists($name, $parentid)
+  function getFolderExists($name, $parent)
     {
     $dao = $this->initDao('Folder', $this->database->fetchRow($this->database->select()
                                                            ->setIntegrityCheck(false)
                                                            ->from('folder')
                                                            ->where('name = ?', $name)
-                                                           ->where('parent_id = ?', $parentid)));
+                                                           ->where('parent_id = ?', $parent->getKey())));
     return $dao;
     }
 
@@ -630,13 +636,26 @@ function getItemsFiltered($folder, $userDao = null, $policy = 0)
         $policyArray[$row['item_id']] = $row['policy'];
         }
       }
+    
+    $listNamesArray = array();
+    
     foreach($rowset as $keyRow => $row)
       {
       if(isset($policyArray[$row['item_id']]))
         {
         $tmpDao = $this->initDao('Item', $row);
         $tmpDao->policy = $policyArray[$row['item_id']];
         $tmpDao->parent_id = $row['folder_id'];
+        
+        if(isset($listNamesArray[$tmpDao->getName()]))
+          {
+          $listNamesArray[$tmpDao->getName()]++;
+          $tmpDao->setName($tmpDao->getName().' ('.$listNamesArray[$tmpDao->getName()].')');
+          }
+        else
+          {
+          $listNamesArray[$tmpDao->getName()] = 0;
+          }
         $return[] = $tmpDao;
         unset($policyArray[$row['item_id']]);
         }