Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
wangyidong
2023-04-11 09:43:39 +08:00
parent f37eea5af8 26ce424cf0
commit 0a45b89acd
8 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+6 -3
View File
@@ -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);
}
}
module/block/control.php
-8
View File
@@ -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();
}
/**
module/block/lang/de.php
+6 -3
View File
@@ -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';
module/block/lang/en.php
+6 -3
View File
@@ -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';
module/block/lang/fr.php
+6 -3
View File
@@ -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';
module/block/lang/zh-cn.php
+6 -3
View File
@@ -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';
module/doc/config.php
+5 -5
View File
@@ -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;
module/doc/control.php
+1
View File
@@ -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();