* code for task #89909.
This commit is contained in:
@@ -106,7 +106,7 @@ class doc extends control
|
||||
$this->view->param = $param;
|
||||
$this->view->libID = $libID;
|
||||
$this->view->lib = $this->doc->getLibById($libID);
|
||||
$this->view->libTree = $this->doc->getLibTree($libID, $libs, 'mine', 0);
|
||||
$this->view->libTree = $this->doc->getLibTree($type != 'mine' ? 0 : $libID, $libs, 'mine', 0);
|
||||
$this->view->pager = $pager;
|
||||
$this->view->type = $type;
|
||||
$this->view->objectID = 0;
|
||||
|
||||
@@ -138,6 +138,7 @@ $lang->doc->myDoc = 'Meine Dokumente';
|
||||
$lang->doc->myView = 'Recently Viewed';
|
||||
$lang->doc->myCollection = 'Meine Favoriten';
|
||||
$lang->doc->myCreation = 'Created By';
|
||||
$lang->doc->myLib = 'My Library';
|
||||
$lang->doc->tableContents = 'Catalog';
|
||||
$lang->doc->addCatalog = 'Add Catalog';
|
||||
$lang->doc->editCatalog = 'Edit Catalog';
|
||||
|
||||
@@ -138,6 +138,7 @@ $lang->doc->myDoc = 'My Documents';
|
||||
$lang->doc->myView = 'Recently Viewed';
|
||||
$lang->doc->myCollection = 'My Favorites';
|
||||
$lang->doc->myCreation = 'Created By';
|
||||
$lang->doc->myLib = 'My Library';
|
||||
$lang->doc->tableContents = 'Directory';
|
||||
$lang->doc->addCatalog = 'Add Catalog';
|
||||
$lang->doc->editCatalog = 'Edit Catalog';
|
||||
|
||||
@@ -138,6 +138,7 @@ $lang->doc->myDoc = 'Mes Documents';
|
||||
$lang->doc->myView = 'Recently Viewed';
|
||||
$lang->doc->myCollection = 'Mes Favoris';
|
||||
$lang->doc->myCreation = 'Created By';
|
||||
$lang->doc->myLib = 'My Library';
|
||||
$lang->doc->tableContents = 'Catalog';
|
||||
$lang->doc->addCatalog = 'Add Catalog';
|
||||
$lang->doc->editCatalog = 'Edit Catalog';
|
||||
|
||||
@@ -138,6 +138,7 @@ $lang->doc->myDoc = '我的文档';
|
||||
$lang->doc->myView = '最近浏览';
|
||||
$lang->doc->myCollection = '我的收藏';
|
||||
$lang->doc->myCreation = '我创建的';
|
||||
$lang->doc->myLib = '我的个人库';
|
||||
$lang->doc->tableContents = '目录';
|
||||
$lang->doc->addCatalog = '添加目录';
|
||||
$lang->doc->editCatalog = '编辑目录';
|
||||
|
||||
+38
-3
@@ -2884,9 +2884,7 @@ class docModel extends model
|
||||
$executionLibs[$lib->execution][$lib->id] = $lib;
|
||||
}
|
||||
|
||||
$executionPairs = $this->dao->select('id,name')->from(TABLE_EXECUTION)
|
||||
->where('id')->in(array_keys($executionLibs))
|
||||
->fetchPairs();
|
||||
$executionPairs = $this->dao->select('id,name')->from(TABLE_EXECUTION)->where('id')->in(array_keys($executionLibs))->fetchPairs();
|
||||
}
|
||||
|
||||
$release = null;
|
||||
@@ -3011,6 +3009,43 @@ class docModel extends model
|
||||
}
|
||||
|
||||
if($type != 'project') $libTree = array_values($libTree[$type]);
|
||||
if($type == 'mine')
|
||||
{
|
||||
$myLib = new stdclass();
|
||||
$myLib->id = 0;
|
||||
$myLib->name = $this->lang->doc->myLib;
|
||||
$myLib->type = 'lib';
|
||||
$myLib->objectType = 'mine';
|
||||
$myLib->objectID = 0;
|
||||
$myLib->active = 0;
|
||||
$myLib->children = $libTree;
|
||||
|
||||
$myView = new stdclass();
|
||||
$myView->id = 0;
|
||||
$myView->name = $this->lang->doc->myView;
|
||||
$myView->type = 'view';
|
||||
$myView->objectType = 'doc';
|
||||
$myView->objectID = 0;
|
||||
$myView->active = zget($this->app->rawParams, 'type', '') == 'view' ? 1 : 0;
|
||||
|
||||
$myCollection = new stdclass();
|
||||
$myCollection->id = 0;
|
||||
$myCollection->name = $this->lang->doc->myCollection;
|
||||
$myCollection->type = 'collect';
|
||||
$myCollection->objectType = 'doc';
|
||||
$myCollection->objectID = 0;
|
||||
$myCollection->active = zget($this->app->rawParams, 'type', '') == 'collect' ? 1 : 0;
|
||||
|
||||
$myCreation = new stdclass();
|
||||
$myCreation->id = 0;
|
||||
$myCreation->name = $this->lang->doc->myCreation;
|
||||
$myCreation->type = 'createdBy';
|
||||
$myCreation->objectType = 'doc';
|
||||
$myCreation->objectID = 0;
|
||||
$myCreation->active = zget($this->app->rawParams, 'type', '') == 'createdBy' ? 1 : 0;
|
||||
|
||||
$libTree = array($myLib, $myView, $myCollection, $myCreation);
|
||||
}
|
||||
return $libTree;
|
||||
}
|
||||
|
||||
|
||||
@@ -431,6 +431,8 @@ $(function()
|
||||
*/
|
||||
function locatePage(libID, moduleID, type)
|
||||
{
|
||||
if(!libID) libID = 0;
|
||||
if(!moduleID) moduleID = 0;
|
||||
linkParams = linkParams.replace('%s', 'libID=' + libID + '&moduleID=' + moduleID);
|
||||
var methodName = '';
|
||||
if(config.currentModule == 'api')
|
||||
@@ -443,10 +445,13 @@ $(function()
|
||||
methodName = 'showFiles';
|
||||
linkParams = 'type=' + objectType + '&objectID=' + objectID;
|
||||
}
|
||||
else if(objectType == 'mine')
|
||||
else if(objectType == 'mine' || objectType == 'view' || objectType == 'collect' || objectType == 'createdBy')
|
||||
{
|
||||
var mySpaceType = 'mine';
|
||||
if(type == 'view' || type == 'collect' || type == 'createdBy') mySpaceType = type;
|
||||
|
||||
methodName = 'mySpace';
|
||||
linkParams = 'type=mine&libID=' + libID;
|
||||
linkParams = 'type='+ mySpaceType + '&libID=' + libID + '&moduleID=' + moduleID;
|
||||
}
|
||||
else if(['text', 'word', 'ppt', 'excel'].indexOf(type) !== -1)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user