ENH: 0009638: Add uploaded link

Author: Charles Marion

core/AppController.php

@@ -70,6 +70,7 @@ public function preDispatch()
         }
       $this->userSession = $user;
       $this->view->recentItems = array();
+      $this->view->showUploadedLink = false;
       if($user->Dao != null && $user->Dao instanceof UserDao)
         {
         if($fc->getRequest()->getControllerName() != 'install' && $fc->getRequest()->getControllerName() != 'error' && $user->Dao->isAdmin() && $this->isUpgradeNeeded())
@@ -80,6 +81,11 @@ public function preDispatch()
           {
           $this->view->needUpgrade = false;
           }
+          
+        if(!empty($user->uploaded))
+          {
+          $this->view->showUploadedLink = true;
+          }
         $this->logged = true;
         $this->view->logged = true;
         $user->Dao->lastAction = date('c');

core/controllers/BrowseController.php

@@ -83,21 +83,14 @@ public function movecopyAction()
         throw new Zend_Exception("Unable to load destination");
         }
 
-      //TODO
-      /*
       foreach($folders as $folder)
-        {
-        
-        if(isset($copySubmit))
+        {        
+        if(!isset($copySubmit))
           {
-          
-          }
-        else
-          {
-          
+          $this->Folder->move($folder, $destination);
           }
         }
-     */
+
       foreach($items as $item)
         {
         if(isset($copySubmit))
@@ -325,6 +318,7 @@ public function uploadedAction()
       {
       $this->_redirect('/');
       }
+    $this->view->activemenu = 'uploaded'; // set the active menu
     $this->view->items = array();
     $this->view->header = $this->t('Uploaded Files');
     $this->view->Date = $this->Component->Date;

core/controllers/CommunityController.php

@@ -148,8 +148,8 @@ function manageAction()
       }//end ajax posts
 
     //init forms
-    $formInfo->setAction($this->view->webroot.'/community/manage?communityId = '.$communityId);
-    $formCreateGroup->setAction($this->view->webroot.'/community/manage?communityId = '.$communityId);
+    $formInfo->setAction($this->view->webroot.'/community/manage?communityId='.$communityId);
+    $formCreateGroup->setAction($this->view->webroot.'/community/manage?communityId='.$communityId);
     $name = $formInfo->getElement('name');
     $name->setValue($communityDao->getName());
     $description = $formInfo->getElement('description');

core/controllers/UserController.php

@@ -10,7 +10,6 @@ class UserController extends AppController
   /** Init Controller */
   function init()
     {
-    $this->view->activemenu = 'user'; // set the active menu
     $actionName = Zend_Controller_Front::getInstance()->getRequest()->getActionName();
     if(isset($actionName) && (is_numeric($actionName) || strlen($actionName) == 32)) // This is tricky! and for Cassandra for now
       {
@@ -422,6 +421,7 @@ public function userpageAction()
     elseif(!isset($user_id))
       {
       $userDao = $this->userSession->Dao;
+      $this->view->activemenu = 'user'; // set the active menu
       }
     else
       {

core/layouts/layout.phtml

@@ -160,7 +160,16 @@
               <li <?php if($this->activemenu=='browse') {echo 'class="active"';} ?> onclick="location.replace('<?php echo $this->webroot?>/browse');" ><a href="<?php echo $this->webroot?>/browse"><img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/data.png" /><span> <?php echo $this->t('Data');?></span></a></li>
               <li <?php if($this->activemenu=='community') {echo 'class="active"';} ?> onclick="location.replace('<?php echo $this->webroot?>/community');" ><a href="<?php echo $this->webroot?>/community"><img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/community.png" /><span> <?php echo $this->t('Communities');?></span></a></li>
               <li id="menuUserInfo" <?php if($this->activemenu=='user') {echo 'class="active"';} ?>  ><a href="javascript:;"><img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/upload.png" /><span> <?php echo $this->t('My Uploads');?></span></a></li>
-            </ul>
+
+               <?php
+              if($this->showUploadedLink)
+                {
+                ?>
+               <li <?php if($this->activemenu=='uploaded') {echo 'class="active"';} ?> onclick="location.replace('<?php echo $this->webroot?>/browse/uploaded');" ><a href="<?php echo $this->webroot?>/browse/uploaded"><img alt="" src="<?php echo $this->coreWebroot?>/public/images/icons/addfile.png" /><span> <?php echo $this->t('Uploaded files');?></span></a></li>
+              <?php
+                }
+              ?>
+             </ul>
             <hr/>
             <?php
             if(isset($this->recentItems)&&!empty($this->recentItems))

core/models/base/AssetstoreModelBase.php

@@ -32,7 +32,7 @@ public function delete($dao)
       }
     $bitreams = $dao->getBitstreams();
     $items = array();
-    foreach ($bitreams as $key => $bitstream)
+    foreach($bitreams as $key => $bitstream)
       {
       $revision = $bitstream->getItemrevision();
       if(empty($revision))
@@ -51,7 +51,7 @@ public function delete($dao)
 
     $modelLoader = new MIDAS_ModelLoader();
     $item_model = $modelLoader->loadModel('Item');
-    foreach ($items as $item)
+    foreach($items as $item)
       {
       $item_model->delete($item);
       }

core/models/base/BitstreamModelBase.php

@@ -20,7 +20,7 @@ public function __construct()
       'path' =>  array('type' => MIDAS_DATA),
       'assetstore_id' =>  array('type' => MIDAS_DATA),
       'date' =>  array('type' => MIDAS_DATA),
-      'itemrevision' =>  array('type' => MIDAS_MANY_TO_ONE, 'model' => 'ItemRevision', 'parent_column'=> 'itemrevision_id', 'child_column' => 'itemrevision_id'),
+      'itemrevision' =>  array('type' => MIDAS_MANY_TO_ONE, 'model' => 'ItemRevision', 'parent_column' => 'itemrevision_id', 'child_column' => 'itemrevision_id'),
       'assetstore' =>  array('type' => MIDAS_MANY_TO_ONE, 'model' => 'Assetstore', 'parent_column' => 'assetstore_id', 'child_column' => 'assetstore_id'),
       );
     $this->initialize(); // required  

core/models/base/FolderModelBase.php

@@ -37,6 +37,7 @@ abstract function getSizeFiltered($folders, $userDao = null, $policy = 0);
   abstract function getCommunity($folder);
   abstract function getUser($folder);
   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);

core/models/pdo/FolderModel.php

@@ -228,6 +228,51 @@ function delete($folder, $recursive = false)
     $folder->saved = false;
     return true;
     } //end delete
+    
+  /** move a folder*/
+  public function move($folder, $parent)
+    {
+    if($folder->getKey() == $parent->getKey())
+      {
+      throw new Zend_Exception("Folder == Parent");
+      }
+    
+    $tmpParent = $parent->getParent();
+    while($tmpParent != false)
+      {
+      if($tmpParent->getKey() == $folder->getKey())
+        {
+        throw new Zend_Exception("Parent is a child of Folder");
+        }
+      $tmpParent = $tmpParent->getParent();
+      }
+    
+    if(!$folder instanceof  FolderDao)
+      {
+      throw new Zend_Exception("Error parameter.");
+      }
+    if(!$parent instanceof  FolderDao)
+      {
+      throw new Zend_Exception("Error parameter.");
+      }
+    $leftIndice = $folder->getLeftIndice();
+    $this->database->getDB()->update('folder', array('left_indice' => new Zend_Db_Expr('left_indice - 2')),
+                          array('left_indice >= ?' => $leftIndice));
+    $this->database->getDB()->update('folder', array('right_indice' => new Zend_Db_Expr('right_indice - 2')),
+                          array('right_indice >= ?' => $leftIndice));
+    $folder->setParentId($parent->getKey());
+    $rightParent = $parent->getRightIndice();
+    
+    $folder->setRightIndice($rightParent + 1);
+    $folder->setLeftIndice($rightParent);
+    
+    $this->database->getDB()->update('folder', array('right_indice' => new Zend_Db_Expr('2 + right_indice')),
+                          array('right_indice >= ?' => $rightParent));
+    $this->database->getDB()->update('folder', array('left_indice' => new Zend_Db_Expr('2 + left_indice')),
+                          array('left_indice >= ?' => $rightParent));
+    
+    parent::save($folder);
+    }//end move
 
   /** Custom save function*/
   public function save($folder)

core/public/js/community/community.manage.js

@@ -399,17 +399,11 @@ function successGroupChange(responseText, statusText, xhr, form)
         }
        else
          {
-         var content="<li><a class='groupLink' groupid='"+jsonResponse[2].group_id+"' href='javascript:;'>"+jsonResponse[2].name+"</a> [<a class='editGroupLink' groupid='"+jsonResponse[2].group_id+"' href='javascript:;'>Edit</a>][<a class='deleteGroupLink' groupid='"+jsonResponse[2].group_id+"' href='javascript:;'>Delete</a>]<span/> </li>";
-         $('div#groupsList ul').append(content);
 
-         var content="<div style='display:none;' class='groupList' id='groupList_"+jsonResponse[2].group_id+"'>";
-         content+="<h4>"+$('div.groupMemberList h4:first').html()+"</h4>";
-         content+='<table cellpadding="0" cellspacing="0" border="0" class="display dataTable">';
-         content+="</table>";
-         content+="</div>";
-         $('div.groupMemberList').append(content);
          }
        init();
+       window.location.replace(json.global.webroot+'/community/manage?communityId='+json.community['community_id']+'#tabs-2');
+       window.location.reload();
     }
   else
     {