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

Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

Browse Source
This commit is contained in:
hufangzhou
2021-04-09 16:29:11 +08:00
parent 2c40f2e7e7 8db49adccc
commit e340901bea
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/menu.php
+6 -3
View File
@@ -334,7 +334,8 @@ $lang->doc->menu->recent = array('link' => "{$lang->doc->recent}|doc|browse|l
$lang->doc->menu->my = array('link' => "{$lang->doc->my}|doc|browse|libID=0&browseTyp=openedbyme", 'alias' => 'my');
$lang->doc->menu->collect = array('link' => "{$lang->doc->favorite}|doc|browse|libID=0&browseTyp=collectedbyme", 'alias' => 'collect');
$lang->doc->menu->product = array('link' => "{$lang->doc->product}|doc|objectLibs|type=product", 'alias' => 'product');
$lang->doc->menu->project = array('link' => "{$lang->doc->project}|doc|objectLibs|type=project", 'alias' => 'project');
if($config->systemMode == 'new') $lang->doc->menu->project = array('link' => "{$lang->doc->project}|doc|objectLibs|type=project", 'alias' => 'project');
if($config->systemMode == 'classic') $lang->doc->menu->execution = array('link' => "{$lang->doc->execution}|doc|objectLibs|type=execution", 'alias' => 'execution');
$lang->doc->menu->custom = array('link' => "{$lang->doc->custom}|doc|objectLibs|type=custom", 'alias' => 'custom');
$lang->doc->dividerMenu = ',product,';
@@ -345,11 +346,13 @@ $lang->doc->menuOrder[10] = 'recent';
$lang->doc->menuOrder[15] = 'my';
$lang->doc->menuOrder[20] = 'collect';
$lang->doc->menuOrder[25] = 'product';
$lang->doc->menuOrder[30] = 'project';
if($config->systemMode == 'new') $lang->doc->menuOrder[30] = 'project';
if($config->systemMode == 'classic') $lang->doc->menuOrder[30] = 'execution';
$lang->doc->menuOrder[35] = 'custom';
$lang->doc->menu->product['subMenu'] = new stdclass();
$lang->doc->menu->project['subMenu'] = new stdclass();
if($config->systemMode == 'new') $lang->doc->menu->project['subMenu'] = new stdclass();
if($config->systemMode == 'classic') $lang->doc->menu->execution['subMenu'] = new stdclass();
$lang->doc->menu->custom['subMenu'] = new stdclass();
/* Report menu.*/
module/common/lang/zh-cn.php
+8 -7
View File
@@ -210,13 +210,14 @@ $lang->project->list = '项目列表';
$lang->execution->list = "{$lang->executionCommon}列表";
$lang->doc->recent = '最近文档';
$lang->doc->my = '我的文档';
$lang->doc->favorite = '我的收藏';
$lang->doc->product = '产品库';
$lang->doc->project = '项目库';
$lang->doc->custom = '自定义库';
$lang->doc->wiki = 'WIKI';
$lang->doc->recent = '最近文档';
$lang->doc->my = '我的文档';
$lang->doc->favorite = '我的收藏';
$lang->doc->product = '产品库';
$lang->doc->project = '项目库';
$lang->doc->execution = "{$lang->executionCommon}库";
$lang->doc->custom = '自定义库';
$lang->doc->wiki = 'WIKI';
$lang->product->list = $lang->productCommon . '列表';
module/doc/control.php
+4 -4
View File
@@ -215,7 +215,6 @@ class doc extends control
if(!dao::isError())
{
$objectType = $this->post->type;
if($objectType == 'project' and $this->post->project) $objectID = $this->post->project;
if($objectType == 'product' and $this->post->product) $objectID = $this->post->product;
if($objectType == 'execution' and $this->post->execution) $objectID = $this->post->execution;
@@ -621,6 +620,8 @@ class doc extends control
}
else
{
$doc = $this->doc->getByID($docID);
$objectType = $this->dao->select('type')->from(TABLE_DOCLIB)->where('id')->eq($doc->lib)->fetch('type');
$this->doc->delete(TABLE_DOC, $docID);
/* if ajax request, send result. */
@@ -638,9 +639,7 @@ class doc extends control
if($from == 'lib')
{
$pos = strpos($this->session->docList, 'docID');
$link = $pos !== false ? substr($this->session->docList, 0, $pos - 1) : $this->session->docList;
$response['locate'] = $link;
$response['locate'] = $this->createLink('doc', 'objectLibs', "type=$objectType");
}
}
$this->send($response);
@@ -1040,6 +1039,7 @@ class doc extends control
}
else if($type == 'execution')
{
$objectID = $this->execution->saveState($objectID, $objects);
$table = TABLE_EXECUTION;
$libs = $this->doc->getLibsByObject('execution', $objectID);