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

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

Browse Source
This commit is contained in:
liyuchun
2021-11-30 12:03:29 +08:00
parent cabe7d0062 5bb1d7b671
commit 570b5c1cdb
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/lang/resource.php
+3 -1
View File
@@ -1204,6 +1204,7 @@ $lang->resource->mr->unlink = 'unlink';
$lang->resource->mr->approval = 'approval';
$lang->resource->mr->close = 'close';
$lang->resource->mr->reopen = 'reopen';
$lang->resource->mr->addBug = 'addBug';
$lang->mr->methodOrder[10] = 'create';
$lang->mr->methodOrder[15] = 'browse';
@@ -1219,7 +1220,8 @@ $lang->mr->methodOrder[70] = 'linkTask';
$lang->mr->methodOrder[75] = 'unlink';
$lang->mr->methodOrder[80] = 'approval';
$lang->mr->methodOrder[85] = 'close';
$lang->mr->methodOrder[85] = 'reopen';
$lang->mr->methodOrder[90] = 'reopen';
$lang->mr->methodOrder[95] = 'addBug';
/* Git. */
$lang->resource->git = new stdclass();
module/mr/control.php
+3 -2
View File
@@ -511,13 +511,14 @@ class mr extends control
$this->config->product->search['params']['module']['values'] = $modules;
$this->config->product->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => $storyStatusList);
if($this->session->currentProductType == 'normal')
if($product->type == 'normal')
{
unset($this->config->product->search['fields']['branch']);
unset($this->config->product->search['params']['branch']);
}
else
{
$this->product->setMenu($productID, 0);
$this->config->product->search['fields']['branch'] = $this->lang->product->branch;
$branches = array('' => '') + $this->loadModel('branch')->getPairs($productID, 'noempty');
$this->config->product->search['params']['branch']['values'] = $branches;
@@ -598,7 +599,7 @@ class mr extends control
}
else
{
$this->product->setMenu($productID, $branch);
$this->product->setMenu($productID, 0);
$this->config->bug->search['fields']['branch'] = $this->lang->product->branch;
$branches = array('' => '') + $this->loadModel('branch')->getPairs($productID, 'noempty');
$this->config->bug->search['params']['branch']['values'] = $branches;
module/mr/lang/en.php
+1
View File
@@ -21,6 +21,7 @@ $lang->mr->linkStory = 'Link Stories';
$lang->mr->linkBug = 'Link Bugs';
$lang->mr->linkTask = 'Link Tasks';
$lang->mr->unlink = 'UnLink of stories,bugs,tasks';
$lang->mr->addBug = 'Add Review';
$lang->mr->id = 'ID';
$lang->mr->mriid = "raw MR ID";
module/mr/lang/zh-cn.php
+1
View File
@@ -21,6 +21,7 @@ $lang->mr->linkStory = '关联需求';
$lang->mr->linkBug = '关联Bug';
$lang->mr->linkTask = '关联任务';
$lang->mr->unlink = '取消关联需求、bug、任务';
$lang->mr->addBug = '添加评审';
$lang->mr->id = 'ID';
$lang->mr->mriid = "MR原始ID";