diff --git a/module/action/model.php b/module/action/model.php index ea2e44208c..c51bcb6852 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -1549,6 +1549,8 @@ class actionModel extends model */ public function setObjectLink($action, $deptUsers, $shadowProducts, $project = null) { + $this->app->loadConfig('doc'); + $action->objectLink = ''; $action->objectLabel = zget($this->lang->action->objectTypes, $action->objectLabel); @@ -1678,9 +1680,10 @@ class actionModel extends model else { $method = 'tablecontents'; - if($docLib->type == 'product') $method = 'productspace'; - if(in_array($docLib->type, array('project', 'execution'))) $method = 'projectspace'; - $params = $method == 'tablecontents' ? sprintf($vars, $docLib->type, $docLib->objectID, $action->objectID, $appendLib) : "objectID={$docLib->objectID}&libID={$action->objectID}"; + if(isset($this->config->doc->spaceMethod[$docLib->type])) $method = $this->config->doc->spaceMethod[$docLib->type]; + if($method == 'myspace') $params = "type=mine&libID={$action->objectID}"; + if($method == 'tablecontents') $params = sprintf($vars, $docLib->type, $docLib->objectID, $action->objectID, $appendLib); + if(!in_array($method, array('myspace', 'tablecontents'))) $params = "objectID={$docLib->objectID}&libID={$action->objectID}"; $action->objectLink = helper::createLink('doc', $method, $params); } } diff --git a/module/block/control.php b/module/block/control.php index 68a6a2aba0..76415e75ec 100755 --- a/module/block/control.php +++ b/module/block/control.php @@ -2042,7 +2042,6 @@ class block extends control */ public function printDocStatisticBlock() { - $this->display(); } /** @@ -2053,7 +2052,6 @@ class block extends control */ public function printDocDynamicBlock() { - $this->display(); } /** @@ -2064,7 +2062,6 @@ class block extends control */ public function printMyCollectionBlock() { - $this->display(); } /** @@ -2075,7 +2072,6 @@ class block extends control */ public function printRecentUpdateBlock() { - $this->display(); } /** @@ -2086,7 +2082,6 @@ class block extends control */ public function printViewListBlock() { - $this->display(); } /** @@ -2097,7 +2092,6 @@ class block extends control */ public function printCollectListBlock() { - $this->display(); } /** @@ -2108,7 +2102,6 @@ class block extends control */ public function printProductDocBlock() { - $this->display(); } /** @@ -2119,7 +2112,6 @@ class block extends control */ public function printProjectDocBlock() { - $this->display(); } /** diff --git a/module/block/lang/de.php b/module/block/lang/de.php index f58cd56d4f..a113c81711 100644 --- a/module/block/lang/de.php +++ b/module/block/lang/de.php @@ -353,9 +353,12 @@ $lang->block->default['doc']['5']['title'] = 'Browse Leaderboard'; $lang->block->default['doc']['5']['block'] = 'viewlist'; $lang->block->default['doc']['5']['grid'] = 4; -$lang->block->default['doc']['6']['title'] = $lang->productCommon . 'Document'; -$lang->block->default['doc']['6']['block'] = 'productdoc'; -$lang->block->default['doc']['6']['grid'] = 8; +if($config->vision == 'rnd') +{ + $lang->block->default['doc']['6']['title'] = $lang->productCommon . 'Document'; + $lang->block->default['doc']['6']['block'] = 'productdoc'; + $lang->block->default['doc']['6']['grid'] = 8; +} $lang->block->default['doc']['7']['title'] = 'Favorite Leaderboard'; $lang->block->default['doc']['7']['block'] = 'collectlist'; diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 74a9bc593a..0a614422fc 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -353,9 +353,12 @@ $lang->block->default['doc']['5']['title'] = 'Browse Leaderboard'; $lang->block->default['doc']['5']['block'] = 'viewlist'; $lang->block->default['doc']['5']['grid'] = 4; -$lang->block->default['doc']['6']['title'] = $lang->productCommon . 'Document'; -$lang->block->default['doc']['6']['block'] = 'productdoc'; -$lang->block->default['doc']['6']['grid'] = 8; +if($config->vision == 'rnd') +{ + $lang->block->default['doc']['6']['title'] = $lang->productCommon . 'Document'; + $lang->block->default['doc']['6']['block'] = 'productdoc'; + $lang->block->default['doc']['6']['grid'] = 8; +} $lang->block->default['doc']['7']['title'] = 'Favorite Leaderboard'; $lang->block->default['doc']['7']['block'] = 'collectlist'; diff --git a/module/block/lang/fr.php b/module/block/lang/fr.php index 96d858c2aa..406b27cb53 100644 --- a/module/block/lang/fr.php +++ b/module/block/lang/fr.php @@ -353,9 +353,12 @@ $lang->block->default['doc']['5']['title'] = 'Browse Leaderboard'; $lang->block->default['doc']['5']['block'] = 'viewlist'; $lang->block->default['doc']['5']['grid'] = 4; -$lang->block->default['doc']['6']['title'] = $lang->productCommon . 'Document'; -$lang->block->default['doc']['6']['block'] = 'productdoc'; -$lang->block->default['doc']['6']['grid'] = 8; +if($config->vision == 'rnd') +{ + $lang->block->default['doc']['6']['title'] = $lang->productCommon . 'Document'; + $lang->block->default['doc']['6']['block'] = 'productdoc'; + $lang->block->default['doc']['6']['grid'] = 8; +} $lang->block->default['doc']['7']['title'] = 'Favorite Leaderboard'; $lang->block->default['doc']['7']['block'] = 'collectlist'; diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index c6ac52b5c5..ea8a382d39 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -353,9 +353,12 @@ $lang->block->default['doc']['5']['title'] = '浏览排行榜'; $lang->block->default['doc']['5']['block'] = 'viewlist'; $lang->block->default['doc']['5']['grid'] = 4; -$lang->block->default['doc']['6']['title'] = $lang->productCommon . '文档'; -$lang->block->default['doc']['6']['block'] = 'productdoc'; -$lang->block->default['doc']['6']['grid'] = 8; +if($config->vision == 'rnd') +{ + $lang->block->default['doc']['6']['title'] = $lang->productCommon . '文档'; + $lang->block->default['doc']['6']['block'] = 'productdoc'; + $lang->block->default['doc']['6']['grid'] = 8; +} $lang->block->default['doc']['7']['title'] = '收藏排行榜'; $lang->block->default['doc']['7']['block'] = 'collectlist'; diff --git a/module/doc/config.php b/module/doc/config.php index 2b4fa0e959..2a640cbce6 100644 --- a/module/doc/config.php +++ b/module/doc/config.php @@ -43,11 +43,11 @@ $config->doc->objectIconList['execution'] = 'icon-run'; $config->doc->objectIconList['mine'] = 'icon-contacts'; $config->doc->objectIconList['custom'] = 'icon-groups'; -$config->doc->spaceMethod['mine'] = 'mySpace'; -$config->doc->spaceMethod['product'] = 'productSpace'; -$config->doc->spaceMethod['project'] = 'projectSpace'; -$config->doc->spaceMethod['execution'] = 'projectSpace'; -$config->doc->spaceMethod['custom'] = 'tableContents'; +$config->doc->spaceMethod['mine'] = 'myspace'; +$config->doc->spaceMethod['product'] = 'productspace'; +$config->doc->spaceMethod['project'] = 'projectspace'; +$config->doc->spaceMethod['execution'] = 'projectspace'; +$config->doc->spaceMethod['custom'] = 'tablecontents'; $config->doc->search['module'] = 'doc'; $config->doc->search['fields']['title'] = $lang->doc->title; diff --git a/module/doc/control.php b/module/doc/control.php index 144d27282c..4040b21932 100755 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -1247,6 +1247,7 @@ class doc extends control $this->view->autoloadPage = $this->doc->checkAutoloadPage($doc); $this->view->libTree = $this->doc->getLibTree($libID, $libs, $type, $doc->module, $objectID); $this->view->preAndNext = $this->loadModel('common')->getPreAndNextObject('doc', $docID); + $this->view->moduleID = $doc->module; $this->view->objectDropdown = $objectDropdown; $this->display();