BUG: fixed import

Improved browser speed

Author: Charles Marion

core/controllers/ImportController.php

@@ -208,6 +208,13 @@ private function _recursiveParseDirectory($path, $currentdir)
 
           // Upload the bitstream ifnecessary (based on the assetstore type)
           $assetstoreDao = $this->Assetstore->load($this->assetstoreid);
+          
+          $assetstorePath = $assetstoreDao->getPath();
+          $bitstreamPath = $bitstreamDao->getPath();
+          
+          $bitstreamPath = substr($bitstreamPath, strlen($assetstorePath));          
+          $bitstreamDao->setPath($bitstreamPath);
+          
           $this->Component->Upload->uploadBitstream($bitstreamDao, $assetstoreDao);
 
           $this->ItemRevision->addBitstream($itemRevisionDao, $bitstreamDao);

core/models/pdo/ItemModel.php

@@ -135,6 +135,14 @@ function delete($itemdao)
         $feed_model->delete($feed);
         }
       }
+    
+    $folder_model = $this->ModelLoader->loadModel('Folder');
+    $folders = $itemdao->getFolders();
+    foreach($folders as $folder)
+      {
+      $folder_model->removeItem($folder, $itemdao);
+      }
+    
     $revisions = $itemdao->getRevisions();
     foreach($revisions as $revision)
       {

core/public/css/layout/jquery.treeTable.css

@@ -22,6 +22,10 @@
   background-image: url(../../images/TreeTable/toggle-collapse-dark.png);
 }
 
+.treeTable span.elementSize{
+  padding: 0px!important;
+}
+
 /* jquery.treeTable.sortable
  * ------------------------------------------------------------------------- */
 .treeTable tr.selected, .treeTable tr.accept {

core/public/js/admin/admin.index.js

@@ -35,6 +35,7 @@
 
       $('input.deleteAssetstoreYes').unbind('click').click(function()
          { 
+          $( "div.MainDialog" ).dialog('close');
           ajaxSelectRequest = $.ajax({
             type: "POST",
             url: json.global.webroot+'/assetstore/delete',

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

@@ -324,32 +324,35 @@
       {
         var i = 1;
         var id=node.attr('id');
-        elements['folders'] = jQuery.makeArray(elements['folders']);
-        elements['items'] = jQuery.makeArray(elements['items']);
+        elements['folders'] = jQuery.makeArray(elements['folders']).reverse();
+        elements['items'] = jQuery.makeArray(elements['items']).reverse();
       //  var padding=parseInt(node.find('td:first').css('padding-left').slice(0,-2));
-        var html='';
-        $.each(elements['folders'], function(index, value) {
-          html+= "<tr id='"+id+"-"+i+"' deletable='"+value['deletable']+"' class='parent child-of-"+id+"' ajax='"+value['folder_id']+"'type='folder'  policy='"+value['policy']+"' element='"+value['folder_id']+"'>";
-          html+=     "  <td><span class='folder'>"+sliceFileName(value['name'],40)+"</span></td>";
-          html+=     "  <td>"+'<img class="folderLoading"  element="'+value['folder_id']+'" alt="" src="'+json.global.coreWebroot+'/public/images/icons/loading.gif"/>'+"</td>";
-          html+=     "  <td>"+value['creation']+"</td>";
-          html+=     "  <td><input type='checkbox' class='treeCheckbox' type='folder' element='"+value['folder_id']+"'/></td>";
-          html+=     "</tr>";
-          i++;
-          });
 
         $.each(elements['items'], function(index, value) { 
+          var html='';
           html+=  "<tr id='"+id+"-"+i+"' class='child-of-"+id+"'  type='item' policy='"+value['policy']+"' element='"+value['item_id']+"'>";
           html+=     "  <td><span class='file'>"+sliceFileName(value['name'],40)+"</span></td>";
           html+=     "  <td>"+value['size']+"</td>";
           html+=     "  <td>"+value['creation']+"</td>";
           html+=     "  <td><input type='checkbox' class='treeCheckbox' type='item' element='"+value['item_id']+"'/></td>";
           html+=     "</tr>";       
           i++;
+          node.after(html)
+          });
+          
+       $.each(elements['folders'], function(index, value) {
+          var html='';
+          html+= "<tr id='"+id+"-"+i+"' deletable='"+value['deletable']+"' class='parent child-of-"+id+"' ajax='"+value['folder_id']+"'type='folder'  policy='"+value['policy']+"' element='"+value['folder_id']+"'>";
+          html+=     "  <td><span class='folder'>"+sliceFileName(value['name'],40)+"</span></td>";
+          html+=     "  <td>"+'<img class="folderLoading"  element="'+value['folder_id']+'" alt="" src="'+json.global.coreWebroot+'/public/images/icons/loading.gif"/>'+"</td>";
+          html+=     "  <td>"+value['creation']+"</td>";
+          html+=     "  <td><input type='checkbox' class='treeCheckbox' type='folder' element='"+value['folder_id']+"'/></td>";
+          html+=     "</tr>";
+          i++;
+          node.after(html)
           });
       }
 
-    node.after(html)
     var cell = $(node.children("td")[options.treeColumn]);
     var padding = getPaddingLeft(cell) + options.indent;
     var arrayCell=childrenOf(node);