ENH: Added "remove item" and fixed remove folder

Author: Charles Marion

core/AppController.php

@@ -125,7 +125,9 @@ public function preDispatch()
       'manage'=>$this->t('Manage'),
       'edit'=>$this->t('Edit'),
       'delete'=>$this->t('Delete'),
+      'removeItem'=>$this->t('Remove Item from Folder'),
       'deleteMessage'=>$this->t('Do you really want to delete the folder'),
+      'removeMessage'=>$this->t('Do you really want to remove the item'),
       'share'=>$this->t('Sharing settings'),
       'rename'=>$this->t('Rename'),
       'move'=>$this->t('Move'),

core/controllers/FolderController.php

@@ -116,7 +116,42 @@ public function deleteAction()
     $this->Folder->delete($folder);
     $folderInfo=$folder->_toArray();
     echo JsonComponent::encode(array(true,$this->t('Changes saved'),$folderInfo));
-    }// end createfolderAction
+    }// end deleteAction
+    
+  /** remove an item from a folder (dialog,ajax only)*/
+  public function removeitemAction()
+    {
+    $this->_helper->layout->disableLayout();
+    $this->_helper->viewRenderer->setNoRender();
+    $folder_id=$this->_getParam('folderId');
+    $item_id=$this->_getParam('itemId');
+    $folder=$this->Folder->load($folder_id);
+    $item=$this->Item->load($item_id);
+    $header="";
+    if(!isset($folder_id))
+      {
+      throw new Zend_Exception("Please set the folderId.");
+      }
+    if(!isset($item_id))
+      {
+      throw new Zend_Exception("Please set the folderId.");
+      }
+    elseif($folder===false)
+      {
+      throw new Zend_Exception("The folder doesn t exist.");
+      }
+    elseif($item===false)
+      {
+      throw new Zend_Exception("The item doesn t exist.");
+      }
+    elseif(!$this->Folder->policyCheck($folder, $this->userSession->Dao, MIDAS_POLICY_WRITE))
+      {
+      throw new Zend_Exception("Permissions error.");
+      }
+      
+    $this->Folder->removeItem($folder,$item);
+    echo JsonComponent::encode(array(true,$this->t('Changes saved')));
+    }// end deleteAction
 
   /** create a folder (dialog,ajax only)*/
   public function createfolderAction()

core/public/js/common/common.browser.js

@@ -111,7 +111,11 @@
                   {
                     createNotive(jsonResponse[1],1500);
                     node.each(function(){
-                      childrenOf($(this)).remove();
+                      var children = childrenOf($(this));
+                      if(children!=undefined)
+                        {
+                        children.remove();
+                        }
                     });
                     node.remove();
                     $( "div.MainDialog" ).dialog('close');
@@ -128,6 +132,60 @@
            $( "div.MainDialog" ).dialog('close');
         });         
 
+    }
+    function removeItem(id)
+    {
+      var html='';
+      html+=json.browse['removeMessage'];
+      html+='<br/>';
+      html+='<br/>';
+      html+='<br/>';
+      html+='<input style="margin-left:140px;" class="globalButton deleteFolderYes" element="'+id+'" type="button" value="'+json.global.Yes+'"/>';
+      html+='<input style="margin-left:50px;" class="globalButton deleteFolderNo" type="button" value="'+json.global.No+'"/>';
+      
+      showDialogWithContent(json.browse['delete'],html,false);
+      
+      $('input.deleteFolderYes').unbind('click').click(function()
+        { 
+          var node=$('table.treeTable tr[element='+id+']');
+          var parent;
+          //get parent
+          var classNames = node.attr('class').split(' ');    
+          for(key in classNames) {
+            if(classNames[key].match("child-of-")) {
+              parent = $("#" + classNames[key].substring(9));
+            }
+          }
+          $.post(json.global.webroot+'/folder/removeitem', {folderId: parent.attr('element'), itemId: id},
+           function(data) {
+               jsonResponse = jQuery.parseJSON(data);
+                if(jsonResponse==null)
+                  {
+                    createNotive('Error',4000);
+                    return;
+                  }
+                if(jsonResponse[0])
+                  {
+                    createNotive(jsonResponse[1],1500);
+                    node.remove();
+                    $( "div.MainDialog" ).dialog('close');
+                    parent.find('span.elementCount').remove();
+                    parent.find('span.elementSize').after("<img class='folderLoading'  element='{"+parent.attr('element')+"}' alt='' src='"+json.global.coreWebroot+"/public/images/icons/loading.gif'/>");
+                    parent.find('span.elementSize').remove();
+                    getElementsSize();
+                  }
+                else
+                  {
+                    createNotive(jsonResponse[1],4000);
+                  }
+           });
+
+        });
+      $('input.deleteFolderNo').unbind('click').click(function()
+        {
+           $( "div.MainDialog" ).dialog('close');
+        });         
+      
     }
 
     function createAction(node)
@@ -164,6 +222,7 @@
             if(policy>=1)
               {
               html+='<li><a  type="item" element="'+element+'" class="sharingLink">'+json.browse.share+'</a></li>';
+              html+='<li><a onclick="removeItem('+element+');">'+json.browse['removeItem']+'</a></li>'; 
               }   
           }
          $('div.viewAction ul').html(html);

core/public/js/layout/jquery.treeTable.js

@@ -70,6 +70,10 @@
 
   function initializeAjax(node,first)
   {
+  if(node==undefined)
+    {
+    return ;
+    }
   var folders='';
   var children;
   if(first)
@@ -469,8 +473,8 @@
           arrayElement=jQuery.parseJSON(data);
           $.each(arrayElement, function(index, value) { 
               var img=$('img.folderLoading[element='+value.id+']');
-              img.after(value.size);
-              img.parents('tr').find('td:first span:last').append(' ('+value.count+')');
+              img.after('<span class="elementSize">'+value.size+'</span>');
+              img.parents('tr').find('td:first span:last').append('<span style="padding-left:0px;" class="elementCount">'+' ('+value.count+')'+'</span>');
               img.remove();
           });
         });

core/translation/fr-main.csv

@@ -92,6 +92,7 @@ Download;T
 Delete Feed;Effacer cette actualit�
 Do you really want to delete the feed;Voulez-vous vraiment supprimer l'actualit�
 Do you really want to delete the folder;Voulez-vous vraiment supprimer le r�pertoire
+Do you really want to remove the item;Voulez-vous vraiment retirer le document
 Yes;Oui
 No;Non
 Plugins;Plugins
@@ -199,4 +200,5 @@ can read;peut voir
 Add a permission to ...;Ajouter une autorisation � ...
 Owned by me;M'appartenant
 Shared to me;Partag�s avec moi
-Shared to Members;Partag�s aux Membres
+Shared to Members;Partag�s aux Membres
+Remove Item from Folder;Enlever le document du r�pertoire