BUG: fixed a but with recent folders

midasplatform · Jun 3, 2011 · e66f00f · e66f00f
1 parent 00d5816
commit e66f00f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 15 deletions.
diff --git a/core/controllers/BrowseController.php b/core/controllers/BrowseController.php
@@ -284,14 +284,14 @@ public function getelementinfoAction()
         $folder = $this->Folder->load($id);
         $jsonContent = array_merge($jsonContent, $folder->toArray());
         $jsonContent['creation'] = $this->Component->Date->formatDate(strtotime($jsonContent['date_update']));
-        if(!isset($this->userSession->Dao->recentFolders))
+        if(!isset($this->userSession->recentFolders))
           {
-          $this->userSession->Dao->recentFolders = array();
+          $this->userSession->recentFolders = array();
           }
-        array_push($this->userSession->Dao->recentFolders, $folder->getKey());
-        if(count($this->userSession->Dao->recentFolders) > 5)
+        array_push($this->userSession->recentFolders, $folder->getKey());
+        if(count($this->userSession->recentFolders) > 5)
           {
-          array_shift($this->userSession->Dao->recentFolders);
+          array_shift($this->userSession->recentFolders);
           }
         break;
       case 'item':

diff --git a/core/controllers/FolderController.php b/core/controllers/FolderController.php
@@ -131,14 +131,14 @@ public function viewAction()
       $header .= "</ul>";
       }
 
-    if(!isset($this->userSession->Dao->recentFolders))
+    if(!isset($this->userSession->recentFolders))
       {
-      $this->userSession->Dao->recentFolders = array();
+      $this->userSession->recentFolders = array();
       }
-    array_push($this->userSession->Dao->recentFolders, $folder->getKey());
-    if(count($this->userSession->Dao->recentFolders) > 5)
+    array_push($this->userSession->recentFolders, $folder->getKey());
+    if(count($this->userSession->recentFolders) > 5)
       {
-      array_shift($this->userSession->Dao->recentFolders);
+      array_shift($this->userSession->recentFolders);
       }
 
     $this->Folder->incrementViewCount($folder);

diff --git a/core/controllers/ItemController.php b/core/controllers/ItemController.php
@@ -137,11 +137,11 @@ function viewAction()
     else
       {
       $parents = $itemDao->getFolders();
-      if(isset($this->userSession->Dao->recentFolders))
+      if(isset($this->userSession->recentFolders))
         {
         foreach($parents as $p)
           {
-          if(in_array($p->getKey(), $this->userSession->Dao->recentFolders))
+          if(in_array($p->getKey(), $this->userSession->recentFolders))
             {
             $currentFolder = $p;
             break;

diff --git a/core/public/js/common/common.browser.js b/core/public/js/common/common.browser.js
@@ -284,6 +284,7 @@
         {
         html+='<img class="infoLogo" alt="Data Type" src="'+json.global.coreWebroot+'/public/images/icons/document-big.png" />';
         }
+        console.log(arrayElement['name']);
         html+='<span class="infoTitle" >'+sliceFileName(arrayElement['name'],27)+'</span>';
         html+='<table>';
         html+='  <tr>';

diff --git a/core/public/js/layout/jquery.treeTable.js b/core/public/js/layout/jquery.treeTable.js
@@ -332,7 +332,7 @@
       //  var padding=parseInt(node.find('td:first').css('padding-left').slice(0,-2));
 
         var j = 1;
-
+        var sliceValue = 42 - (id.split('-').length - 1)*3;
 
          $.each(elements['folders'], function(index, value) {
           if(j > 70)
@@ -345,7 +345,7 @@
             return;
             }
           html+= "<tr id='"+id+"-"+i+"' deletable='"+value['deletable']+"' privacy='"+value['privacy_status']+"'  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><span class='folder'>"+sliceFileName(value['name'],sliceValue)+"</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['date_update']+"</td>";
           html+=     "  <td><input type='checkbox' class='treeCheckbox' type='folder' element='"+value['folder_id']+"'/></td>";
@@ -366,7 +366,7 @@
             return;
             }
           html+=  "<tr id='"+id+"-"+i+"' class='child-of-"+id+"' privacy='"+value['privacy_status']+"'  type='item' policy='"+value['policy']+"' element='"+value['item_id']+"'>";
-          html+=     "  <td><span class='file'>"+sliceFileName(value['name'],40)+"</span></td>";
+          html+=     "  <td><span class='file'>"+sliceFileName(value['name'],sliceValue)+"</span></td>";
           html+=     "  <td>"+value['size']+"</td>";
           html+=     "  <td>"+value['date_update']+"</td>";
           html+=     "  <td><input type='checkbox' class='treeCheckbox' type='item' element='"+value['item_id']+"'/></td>";