Merge branch '0384_ShareDupe_yuzheng'

* 0384_ShareDupe_yuzheng:
  BUG: refs #0384. Fix Folder::getItemsFiltered() to display shared items
  BUG: Refs #0384. Fixed a logic error in sharing item. check if the destination folder is the souce folder first, then share item.
  BUG: Refs #0384. Fixed the error in UploadDownloadControllerTest.
  BUG: Refs #0384. fixed the styling issue.
  BUG: Refs #0384. Change item name convention to avoid same named items in the same folder.
  ENH: Refs #0384. Fixed style errors.
  ENH: Refs #0384. Support both share and duplicate actions for items.

Author: cpatrick

core/controllers/BrowseController.php

@@ -58,10 +58,16 @@ public function indexAction()
   /** move or copy selected element*/
   public function movecopyAction()
     {
-    $copySubmit = $this->_getParam('copyElement');
+    $shareSubmit = $this->_getParam('shareElement');
+    $duplicateSubmit = $this->_getParam('duplicateElement');
     $moveSubmit = $this->_getParam('moveElement');
+
     $select = $this->_getParam('selectElement');
-    if(isset($copySubmit) || isset($moveSubmit))
+    $share = $this->_getParam('share');
+    $duplicate = $this->_getParam('duplicate');
+
+    // used for drag-and-drop actions
+    if(isset($moveSubmit) || isset($shareSubmit) || isset($duplicateSubmit))
       {
       $elements = explode(';', $this->_getParam('elements'));
       $destination = $this->_getParam('destination');
@@ -70,41 +76,58 @@ public function movecopyAction()
       $itemIds = explode('-', $elements[1]);
       $folders = $this->Folder->load($folderIds);
       $items = $this->Item->load($itemIds);
-      $destination = $this->Folder->load($destination);
+      $destinationFolder = $this->Folder->load($destination);
       if(empty($folders) && empty ($items))
         {
         throw new Zend_Exception("No element selected");
         }
-      if($destination == false)
+      if($destinationFolder == false)
         {
         throw new Zend_Exception("Unable to load destination");
         }
 
       foreach($folders as $folder)
         {
-        if(!isset($copySubmit))
+        if(isset($moveSubmit))
           {
-          $this->Folder->move($folder, $destination);
+          $this->Folder->move($folder, $destinationFolder);
           }
         }
 
+      $sourceFolderIds = array();
       foreach($items as $item)
         {
-        if(isset($copySubmit))
+        if(isset($shareSubmit))
           {
-          $this->Folder->addItem($destination, $item);
-          $this->Item->copyParentPolicies($item, $destination);
+          foreach($item->getFolders() as $parentFolder)
+            {
+            $folderId = $parentFolder->getKey();
+            array_push($sourceFolderIds, $folderId);
+            }
+          if(in_array($destinationFolder->getKey(), $sourceFolderIds))
+            {
+            $this->_redirect('/item/'.$item->getKey());
+            }
+          else
+            {
+            $this->Folder->addItem($destinationFolder, $item);
+            $this->Item->addReadonlyPolicy($item, $destinationFolder);
+            }
           }
-        else
+        elseif(isset($duplicateSubmit))
+          {
+          $this->Item->duplicateItem($item, $this->userSession->Dao, $destinationFolder);
+          }
+        else //moveSubmit
           {
           $from = $this->_getParam('from');
           $from = $this->Folder->load($from);
-          if($destination == false)
+          if($destinationFolder == false)
             {
             throw new Zend_Exception("Unable to load destination");
             }
-          $this->Folder->addItem($destination, $item);
-          $this->Item->copyParentPolicies($item, $destination);
+          $this->Folder->addItem($destinationFolder, $item);
+          $this->Item->copyParentPolicies($item, $destinationFolder);
           $this->Folder->removeItem($from, $item);
           }
         }
@@ -115,24 +138,19 @@ public function movecopyAction()
         echo JsonComponent::encode(array(true, $this->t('Changes saved')));
         return;
         }
-      $this->_redirect('/folder/'.$destination->getKey());
+      $this->_redirect('/folder/'.$destinationFolder->getKey());
       }
 
+    // Used for movecopy dialog
     $this->requireAjaxRequest();
     $this->_helper->layout->disableLayout();
 
-    if(!isset($select))
+    if(isset($share) || isset($duplicate))
       {
       $folderIds = $this->_getParam('folders');
       $itemIds = $this->_getParam('items');
-      $move = $this->_getParam('move');
       $this->view->folderIds = $folderIds;
       $this->view->itemIds = $itemIds;
-      $this->view->moveEnabled = true;
-      if(isset($move))
-        {
-        $this->view->moveEnabled = false;
-        }
       $folderIds = explode('-', $folderIds);
       $itemIds = explode('-', $itemIds);
       $folders = $this->Folder->load($folderIds);
@@ -147,9 +165,19 @@ public function movecopyAction()
         }
       $this->view->folders = $folders;
       $this->view->items = $items;
+      if(isset($share))
+        {
+        $this->view->shareEnabled = true;
+        $this->view->duplicateEnabled = false;
+        }
+      else
+        {
+        $this->view->duplicateEnabled = true;
+        $this->view->shareEnabled = false;
+        }
       $this->view->selectEnabled = false;
       }
-    else
+    else //isset($select)
       {
       $this->view->selectEnabled = true;
       }
@@ -225,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/controllers/ItemController.php

@@ -26,7 +26,11 @@ class ItemController extends AppController
   public $_components = array('Date', 'Utility', 'Sortdao');
   public $_forms = array('Item');
 
-  /** Init Controller */
+  /**
+   * Init Controller
+   *
+   * @method init()
+  */
   function init()
     {
     $this->view->activemenu = ''; // set the active menu
@@ -38,7 +42,13 @@ function init()
     }  // end init()
 
 
-  /** create/edit metadata*/
+
+  /**
+   * create/edit metadata
+   *
+   * @method editmetadataAction()
+   * @throws Zend_Exception on non-logged user, invalid itemId and incorrect access permission
+  */
   function editmetadataAction()
     {
     $this->disableLayout();
@@ -77,7 +87,12 @@ function editmetadataAction()
     $this->view->jsonMetadataType = JsonComponent::encode($this->view->metadataType);
     }
 
-  /** view a community*/
+  /**
+   * View a Item
+   *
+   * @method viewAction()
+   * @throws Zend_Exception on invalid itemId and incorrect access permission
+  */
   function viewAction()
     {
     $this->view->header = $this->t("Item");
@@ -261,12 +276,19 @@ function viewAction()
 
     $this->view->json['item'] = $itemDao->toArray();
     $this->view->json['item']['message']['delete'] = $this->t('Delete');
+    $this->view->json['item']['message']['sharedItem'] = $this->t('This item is currrently shared by other folders and/or communities. Deletion will make it disappear in all these folders and/or communitites. ');
     $this->view->json['item']['message']['deleteMessage'] = $this->t('Do you really want to delete this item? It cannot be undone.');
     $this->view->json['item']['message']['deleteMetadataMessage'] = $this->t('Do you really want to delete this metadata? It cannot be undone.');
-    $this->view->json['item']['message']['movecopy'] = $this->t('Copy Item.');
+    $this->view->json['item']['message']['share'] = $this->t('Share Item (Display the same item in the destination folder)');
+    $this->view->json['item']['message']['duplicate'] = $this->t('Duplicate Item (Create a new item in the destination folder)');
     }//end index
 
-  /** Edit  (ajax) */
+  /**
+   * Edit an item
+   *
+   * @method editAction()
+   * @throws Zend_Exception on invalid itemId and incorrect access permission
+  */
   function editAction()
     {
     $this->disableLayout();
@@ -308,7 +330,12 @@ function editAction()
     $this->view->form = $formArray;
     }
 
-  /** Delete an item */
+  /**
+   * Delete an item
+   *
+   * @method deleteAction()
+   * @throws Zend_Exception on invalid itemId and incorrect access permission
+  */
   function deleteAction()
     {
     $this->disableLayout();
@@ -331,7 +358,12 @@ function deleteAction()
     }//end delete
 
 
-  /** Merge items*/
+  /**
+   * Merge items
+   *
+   * @method mergeAction()
+   * @throws Zend_Exception on invalid item name and incorrect access permission
+  */
   function mergeAction()
     {
     $this->_helper->layout->disableLayout();
@@ -383,6 +415,34 @@ function mergeAction()
     $this->Item->save($mainItem);
 
     $this->_redirect('/browse/uploaded');
-    }//end delete
+    }//end merge
+
+  /**
+   * Check if an item is shared
+   *
+   * ajax function which checks if an item is shared in other folder/community
+   *
+   * @method checksharedAction()
+   * @throws Zend_Exception on non-ajax call
+  */
+  public function checksharedAction()
+    {
+    if(!$this->getRequest()->isXmlHttpRequest())
+      {
+      throw new Zend_Exception("Why are you here ? Should be ajax.");
+      }
+    $this->disableLayout();
+    $this->disableView();
+    $itemId = $this->_getParam("itemId");
+    $itemDao = $this->Item->load($itemId);
+    $shareCount = count($itemDao->getFolders());
+    $ifShared = false;
+    if($shareCount > 1)
+      {
+      $ifShared = true;
+      }
+
+    echo JsonComponent::encode($ifShared);
+    } // end checkshared
 
   }//end class

core/controllers/components/UploadComponent.php

@@ -139,7 +139,7 @@ public function createLinkItem($userDao, $name, $url, $parent = null)
 
     Zend_Loader::loadClass('ItemDao', BASE_PATH.'/core/models/dao');
     $item = new ItemDao;
-    $item->setName($name);
+    $item->setName($itemModel->updateItemName($name, $parent));
     $item->setDescription('');
     $item->setType(0);
     $item->setThumbnail('');