BUG: Refs #0309. User can manage(change permission, delete) top lever folders except for the default 'Public' and 'Private' folders.

The changes apply to user folders and community folders. The actions are only shown in user manage view and community manage view.

Author: yuzhengZ

core/controllers/FolderController.php

@@ -184,11 +184,14 @@ public function deleteAction()
       }
 
     $parent = $folder->getParent();
-    if($this->Folder->getCommunity($parent) != false || $this->Folder->getCommunity($folder) != false)
+    $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)
       {
       throw new Zend_Exception("Community Folder. You cannot delete it.");
       }
-    if($this->Folder->getUser($parent) != false || $this->Folder->getUser($folder) != false)
+    // 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)
       {
       throw new Zend_Exception("User Folder. You cannot delete it.");
       }

core/views/community/manage.phtml

@@ -236,11 +236,20 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
             <?php
             $communityId = $this->communityDao->getKey();
             $node = MIDAS_MAXIMUM_FOLDER_NUMBERS_PER_LEVEL * $communityId;
-
+            
             foreach($this->folders as $folder)
               {
-              echo "<tr id='node--$node' class='parent' 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>";
+              $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 "  <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>";
@@ -315,7 +324,7 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
     <div class='sideElementFirst genericAction'>
       <h1>Actions</h1>
         <ul>
-          <li><a onclick='createNewFolder(".$this->mainFolder->getKey().");'><img alt='' src='{$this->coreWebroot}/public/images/FileTree/directory.png'/> {$this->t('Create top level Folder')}</a></li>
+          <li><a onclick='createNewFolder(".$this->mainFolder->getKey().");'><img alt='' src='{$this->coreWebroot}/public/images/FileTree/directory.png'/> {$this->t('Create a top level Folder')}</a></li>
           <li><a href='javascript:;' id='communityDeleteLink'><img alt='' src='{$this->coreWebroot}/public/images/icons/close.png'/> {$this->t('Delete Community')}</a></li>
        </ul>
     </div>";    

core/views/user/manage.phtml

@@ -56,8 +56,17 @@ $this->headScript()->appendFile($this->coreWebroot.'/public/js/common/common.bro
 
             foreach($this->folders as $folder)
               {
-              echo "<tr id='node--$node' class='parent' 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>";
+              $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 "  <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>";
@@ -149,7 +158,7 @@ if(!empty($this->userCommunities))
     <h1>Actions</h1> 
       <ul>
         <?php
-        echo "<li><a onclick='createNewFolder(".$this->mainFolder->getKey().");'><img alt='' src='{$this->coreWebroot}/public/images/FileTree/directory.png'/> {$this->t('Create top level Folder')}</a></li>";
+        echo "<li><a onclick='createNewFolder(".$this->mainFolder->getKey().");'><img alt='' src='{$this->coreWebroot}/public/images/FileTree/directory.png'/> {$this->t('Create a top level Folder')}</a></li>";
         ?>
       </ul>
     </div>