BUG: Refs #0309. Let user delete and change permissions to any root folders including the default

'Public' and 'Private' folders.

Author: yuzhengZ

core/controllers/BrowseController.php

@@ -199,14 +199,7 @@ public function getfolderscontentAction()
       $tmp['folder_id'] = $folder->getFolderId();
       $tmp['name'] = $folder->getName();
       $tmp['date_update'] = $this->Component->Date->ago($folder->getDateUpdate(), true);
-      if($tmp['name'] == 'Public' || $tmp['name'] == 'Private')
-        {
-        $tmp['deletable'] = 'false';
-        }
-      else
-        {
-        $tmp['deletable'] = 'true';
-        }
+      $tmp['deletable'] = 'true';
       $tmp['policy'] = $folder->policy;
       $tmp['privacy_status'] = $folder->privacy_status;
       $jsonContent[$folder->getParentId()]['folders'][] = $tmp;

core/controllers/FolderController.php

@@ -183,15 +183,13 @@ public function deleteAction()
       throw new Zend_Exception("Permissions error.");
       }
 
-    $parent = $folder->getParent();
-    $folderName = $folder->getName();
     // User cannot delete community's root folder, the default 'Public' folder and the default 'Private' folder
-    if(($this->Folder->getCommunity($parent) != false && ($folderName == 'Public' || $folderName  == 'Private')) || $this->Folder->getCommunity($folder) != false)
+    if($this->Folder->getCommunity($folder) != false)
       {
       throw new Zend_Exception("Community Folder. You cannot delete it.");
       }
     // User cannot delete its root folder, the default 'Public' folder and the default 'Private' folder
-    if(($this->Folder->getUser($parent) != false && ($folderName == 'Public' || $folderName  == 'Private')) || $this->Folder->getUser($folder) != false)
+    if($this->Folder->getUser($folder) != false)
       {
       throw new Zend_Exception("User Folder. You cannot delete it.");
       }

core/views/community/manage.phtml

@@ -239,17 +239,8 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
 
             foreach($this->folders as $folder)
               {
-              $folderName = $folder->getName();
-              if ($folderName == 'Public' || $folderName  == 'Private')
-                {
-                $deletableStatus = 'false';
-                }
-              else
-                {
-                $deletableStatus = 'true';
-                }
-              echo "<tr id='node--$node' class='parent' deletable=$deletableStatus privacy='{$folder->getPrivacyStatus()}' policy='".MIDAS_POLICY_ADMIN."' type='folder' element='{$folder->getFolderId()}' ajax='{$folder->getFolderId()}'>";
-              echo "  <td class='treeBrowseElement'><span class='notdraggable folder'>$folderName</span></td>";
+              echo "<tr id='node--$node' class='parent' deletable='true' privacy='{$folder->getPrivacyStatus()}' policy='".MIDAS_POLICY_ADMIN."' type='folder' element='{$folder->getFolderId()}' ajax='{$folder->getFolderId()}'>";
+              echo "  <td class='treeBrowseElement'><span class='notdraggable folder'>{$folder->getName()}</span></td>";
               echo "  <td><img class='folderLoading'  element='{$folder->getFolderId()}' alt='' src='{$this->coreWebroot}/public/images/icons/loading.gif'/></td>";
               echo "  <td>{$this->Date->ago($folder->getDateUpdate(),true)}</td>";
               echo "  <td><input type='checkbox' class='treeCheckbox' type='folder' element='{$folder->getFolderId()}' /></td>";

core/views/user/manage.phtml

@@ -56,17 +56,8 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
 
             foreach($this->folders as $folder)
               {
-              $folderName = $folder->getName();
-              if ($folderName == 'Public' || $folderName  == 'Private')
-                {
-                $deletableStatus = 'false';
-                }
-              else
-                {
-                $deletableStatus = 'true';
-                }
-              echo "<tr id='node--$node' class='parent' deletable=$deletableStatus privacy='{$folder->getPrivacyStatus()}' policy='".MIDAS_POLICY_ADMIN."' type='folder' element='{$folder->getFolderId()}' ajax='{$folder->getFolderId()}'>";
-              echo "  <td class='treeBrowseElement'><span class='notdraggable folder'>$folderName</span></td>";
+              echo "<tr id='node--$node' class='parent' deletable='true' privacy='{$folder->getPrivacyStatus()}' policy='".MIDAS_POLICY_ADMIN."' type='folder' element='{$folder->getFolderId()}' ajax='{$folder->getFolderId()}'>";
+              echo "  <td class='treeBrowseElement'><span class='notdraggable folder'>{$folder->getName()}</span></td>";
               echo "  <td><img class='folderLoading'  element='{$folder->getFolderId()}' alt='' src='{$this->coreWebroot}/public/images/icons/loading.gif'/></td>";
               echo "  <td>{$this->Date->ago($folder->getDateUpdate(),true)}</td>";
               echo "  <td><input type='checkbox' class='treeCheckbox' type='folder' element='{$folder->getFolderId()}' /></td>";