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

Merge branch 'sprint/tsj_compatibility' into 'master'

Browse Source 
Sprint/tsj compatibility

See merge request easycorp/zentaopms!6984
This commit is contained in:
王怡栋
2023-02-17 06:17:08 +00:00
parent 2b75166e7c 13be8ec1a7
commit 99c3514e5a
16 changed files with 83 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/custom/ext/lang/de/lite.php
+3 -3
View File
@@ -1,9 +1,9 @@
<?php
$lang->custom->execution = 'Kanban';
$lang->custom->closedExecution = 'Closed ' . $lang->custom->execution;
$lang->custom->executionCommon = 'Kanban';
$lang->custom->closedExecution = 'Closed ' . $lang->custom->executionCommon;
$lang->custom->notice->readOnlyOfExecution = "If Change Forbidden, any change on tasks, builds, efforts and stories of the closed {$lang->executionCommon} is also forbidden.";
$lang->custom->moduleName['execution'] = $lang->custom->execution;
$lang->custom->moduleName['execution'] = $lang->custom->executionCommon;
$lang->custom->task = new stdClass();
$lang->custom->task->fields['required'] = $lang->custom->required;
extension/lite/custom/ext/lang/en/lite.php
+3 -3
View File
@@ -1,9 +1,9 @@
<?php
$lang->custom->execution = 'Kanban';
$lang->custom->closedExecution = 'Closed ' . $lang->custom->execution;
$lang->custom->executionCommon = 'Kanban';
$lang->custom->closedExecution = 'Closed ' . $lang->custom->executionCommon;
$lang->custom->notice->readOnlyOfExecution = "If Change Forbidden, any change on tasks, builds, efforts and stories of the closed {$lang->executionCommon} is also forbidden.";
$lang->custom->moduleName['execution'] = $lang->custom->execution;
$lang->custom->moduleName['execution'] = $lang->custom->executionCommon;
$lang->custom->task = new stdClass();
$lang->custom->task->fields['required'] = $lang->custom->required;
extension/lite/custom/ext/lang/fr/lite.php
+3 -3
View File
@@ -1,9 +1,9 @@
<?php
$lang->custom->execution = 'Kanban';
$lang->custom->closedExecution = 'Closed ' . $lang->custom->execution;
$lang->custom->executionCommon = 'Kanban';
$lang->custom->closedExecution = 'Closed ' . $lang->custom->executionCommon;
$lang->custom->notice->readOnlyOfExecution = "If Change Forbidden, any change on tasks, builds, efforts and stories of the closed {$lang->executionCommon} is also forbidden.";
$lang->custom->moduleName['execution'] = $lang->custom->execution;
$lang->custom->moduleName['execution'] = $lang->custom->executionCommon;
$lang->custom->task = new stdClass();
$lang->custom->task->fields['required'] = $lang->custom->required;
extension/lite/custom/ext/lang/zh-cn/lite.php
+4 -4
View File
@@ -1,9 +1,9 @@
<?php
$lang->custom->execution = '看板';
$lang->custom->closedExecution = '已关闭' . $lang->custom->execution;
$lang->custom->notice->readOnlyOfExecution = "禁止修改后，已关闭{$lang->custom->execution}下的任务、日志以及关联目标都禁止修改。";
$lang->custom->executionCommon = '看板';
$lang->custom->closedExecution = '已关闭' . $lang->custom->executionCommon;
$lang->custom->notice->readOnlyOfExecution = "禁止修改后，已关闭{$lang->custom->executionCommon}下的任务、日志以及关联目标都禁止修改。";
$lang->custom->moduleName['execution'] = $lang->custom->execution;
$lang->custom->moduleName['execution'] = $lang->custom->executionCommon;
$lang->custom->task = new stdClass();
$lang->custom->task->fields['required'] = $lang->custom->required;
module/admin/config.php
+1 -1
View File
@@ -21,7 +21,7 @@ $config->admin->menuGroup['convert'] = array('convert');
$config->admin->menuModuleGroup['model']['custom|set'] = array('project', 'issue', 'risk', 'opportunity', 'nc');
$config->admin->menuModuleGroup['model']['custom|required'] = array('project', 'build');
$config->admin->menuModuleGroup['feature']['custom|set'] = array('todo', 'block', 'story', 'task', 'bug', 'testcase', 'testtask', 'feedback', 'user', 'ticket');
$config->admin->menuModuleGroup['feature']['custom|required'] = array('bug', 'doc', 'product', 'story', 'productplan', 'release', 'task', 'testcase', 'testsuite', 'testtask', 'testreport', 'caselib', 'doc', 'feedback', 'user');
$config->admin->menuModuleGroup['feature']['custom|required'] = array('bug', 'doc', 'product', 'story', 'productplan', 'release', 'task', 'testcase', 'testsuite', 'testtask', 'testreport', 'caselib', 'doc', 'feedback', 'user', 'execution');
$config->admin->menuModuleGroup['template']['custom|set'] = array('baseline');
if($config->vision == 'lite')
{
module/admin/lang/menu.php
+3 -3
View File
@@ -98,7 +98,7 @@ $lang->admin->menuList->model['tabMenu']['menuOrder']['waterfall']['5'] = 'stage
$lang->admin->menuList->feature['subMenu']['my'] = array('link' => "{$lang->my->common}|custom|set|module=todo&field=priList", 'exclude' => 'set,required');
$lang->admin->menuList->feature['subMenu']['product'] = array('link' => "{$lang->productCommon}|custom|required|module=product", 'exclude' => 'set,required', 'alias' => 'browsestoryconcept,product');
$lang->admin->menuList->feature['subMenu']['execution'] = array('link' => "{$lang->execution->common}|custom|execution|");
$lang->admin->menuList->feature['subMenu']['execution'] = array('link' => "{$lang->execution->common}|custom|required|module=execution", 'exclude' => 'required,set', 'alias' => 'execution');
$lang->admin->menuList->feature['subMenu']['qa'] = array('link' => "{$lang->qa->common}|custom|required|module=bug", 'exclude' => 'set,required');
$lang->admin->menuList->feature['subMenu']['kanban'] = array('link' => "{$lang->kanban->common}|custom|kanban|");
$lang->admin->menuList->feature['subMenu']['doc'] = array('link' => "{$lang->doc->common}|custom|required|module=doc", 'exclude' => 'required');
@@ -112,8 +112,8 @@ $lang->admin->menuList->feature['tabMenu']['product']['story'] = array('li
$lang->admin->menuList->feature['tabMenu']['product']['productplan'] = array('link' => "{$lang->productplan->shortCommon}|custom|required|module=productplan", 'exclude' => 'custom-required');
$lang->admin->menuList->feature['tabMenu']['product']['release'] = array('link' => "{$lang->release->common}|custom|required|module=release", 'exclude' => 'custom-required');
$lang->admin->menuList->feature['tabMenu']['execution']['execution'] = array('link' => "{$lang->execution->common}|custom|execution|");
$lang->admin->menuList->feature['tabMenu']['execution']['task'] = array('link' => "{$lang->task->common}|custom|required|module=task", 'links' => array('custom|set|module=task&field=priList'));
$lang->admin->menuList->feature['tabMenu']['execution']['execution'] = array('link' => "{$lang->execution->common}|custom|required|module=execution", 'links' => array("custom|execution|"), 'alias' => 'execution', 'exclude' => 'custom-required');
$lang->admin->menuList->feature['tabMenu']['execution']['task'] = array('link' => "{$lang->task->common}|custom|required|module=task", 'links' => array('custom|set|module=task&field=priList'), 'exclude' => 'custom-required');
$lang->admin->menuList->feature['tabMenu']['qa']['bug'] = array('link' => "{$lang->bug->common}|custom|required|module=bug", 'links' => array("custom|set|module=bug&field=priList"), 'exclude' => 'custom-required,custom-set');
$lang->admin->menuList->feature['tabMenu']['qa']['testcase'] = array('link' => "{$lang->testcase->common}|custom|required|module=testcase", 'links' => array("custom|set|module=testcase&field=priList"), 'exclude' => 'custom-required,custom-set');
module/admin/model.php
+1 -1
View File
@@ -402,7 +402,7 @@ class adminModel extends model
foreach($orders as $index => $menuKey)
{
$menuList->$menuKey = $this->lang->admin->menuList->$menuKey;
$menuList->$menuKey['order'] = $index;
$menuList->{$menuKey}['order'] = $index;
}
$this->lang->admin->menuList = $menuList;
module/custom/config.php
+1 -1
View File
@@ -71,4 +71,4 @@ $config->custom->fieldList['doc'] = 'keywords,content';
$config->custom->fieldList['user']['create'] = 'dept,role,email,commiter';
$config->custom->fieldList['user']['edit'] = 'dept,role,email,commiter,skype,qq,mobile,phone,address,zipcode,dingding,slack,whatsapp,weixin';
$config->custom->notSetMethods = array('required', 'browsestoryconcept', 'product', 'role');
$config->custom->notSetMethods = array('required', 'browsestoryconcept', 'product', 'role', 'execution');
module/custom/control.php
+2 -3
View File
@@ -546,9 +546,8 @@ class custom extends control
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'reload'));
}
$this->view->title = $this->lang->custom->execution;
$this->view->position[] = $this->lang->custom->common;
$this->view->position[] = $this->view->title;
$this->view->title = $this->lang->custom->executionCommon;
$this->view->module = 'execution';
$this->display();
}
module/custom/lang/de.php
+6 -2
View File
@@ -55,7 +55,7 @@ $lang->custom->role = 'Role';
$lang->custom->dept = 'Dept';
$lang->custom->code = $lang->code;
$lang->custom->setCode = 'Enable or Disable Code';
$lang->custom->execution = 'Execution';
$lang->custom->executionCommon = 'Execution';
$lang->custom->selectDefaultProgram = 'Please select default program';
$lang->custom->defaultProgram = 'Default program';
$lang->custom->modeManagement = 'Mode Management';
@@ -98,6 +98,10 @@ $lang->custom->project->defaultCurrency = 'Default Currency';
$lang->custom->project->fields['required'] = $lang->custom->required;
$lang->custom->project->fields['unitList'] = 'Unit List';
$lang->custom->execution = new stdClass();
$lang->custom->execution->fields['required'] = $lang->custom->required;
$lang->custom->execution->fields['execution'] = 'Close Setting';
$lang->custom->product = new stdClass();
$lang->custom->product->fields['required'] = $lang->custom->required;
$lang->custom->product->fields['browsestoryconcept'] = 'Story Concpet';
@@ -289,7 +293,7 @@ $lang->custom->CRKanban[0] = 'Change Forbidden';
$lang->custom->moduleName['product'] = $lang->productCommon;
$lang->custom->moduleName['productplan'] = 'Plan';
$lang->custom->moduleName['execution'] = $lang->custom->execution;
$lang->custom->moduleName['execution'] = $lang->custom->executionCommon;
$lang->custom->conceptQuestions['overview'] = "Which combination of management fits your company?";
$lang->custom->conceptQuestions['URAndSR'] = "Do you want to use the concept of {$lang->URCommon} and {$lang->SRCommon} in ZenTao?";
module/custom/lang/en.php
+6 -2
View File
@@ -55,7 +55,7 @@ $lang->custom->role = 'Role';
$lang->custom->dept = 'Dept';
$lang->custom->code = $lang->code;
$lang->custom->setCode = 'Enable or Disable Code';
$lang->custom->execution = 'Execution';
$lang->custom->executionCommon = 'Execution';
$lang->custom->selectDefaultProgram = 'Please select default program';
$lang->custom->defaultProgram = 'Default program';
$lang->custom->modeManagement = 'Mode Management';
@@ -98,6 +98,10 @@ $lang->custom->project->defaultCurrency = 'Default Currency';
$lang->custom->project->fields['required'] = $lang->custom->required;
$lang->custom->project->fields['unitList'] = 'Unit List';
$lang->custom->execution = new stdClass();
$lang->custom->execution->fields['required'] = $lang->custom->required;
$lang->custom->execution->fields['execution'] = 'Close Setting';
$lang->custom->product = new stdClass();
$lang->custom->product->fields['required'] = $lang->custom->required;
$lang->custom->product->fields['browsestoryconcept'] = 'Story Concpet';
@@ -289,7 +293,7 @@ $lang->custom->CRKanban[0] = 'Change Forbidden';
$lang->custom->moduleName['product'] = $lang->productCommon;
$lang->custom->moduleName['productplan'] = 'Plan';
$lang->custom->moduleName['execution'] = $lang->custom->execution;
$lang->custom->moduleName['execution'] = $lang->custom->executionCommon;
$lang->custom->conceptQuestions['overview'] = "Which combination of management fits your company?";
$lang->custom->conceptQuestions['URAndSR'] = "Do you want to use the concept of {$lang->URCommon} and {$lang->SRCommon} in ZenTao?";
module/custom/lang/fr.php
+6 -2
View File
@@ -55,7 +55,7 @@ $lang->custom->role = 'Role';
$lang->custom->dept = 'Dept';
$lang->custom->code = $lang->code;
$lang->custom->setCode = 'Activer ou Désactiver le Code';
$lang->custom->execution = 'Execution';
$lang->custom->executionCommon = 'Execution';
$lang->custom->selectDefaultProgram = 'Please select default program';
$lang->custom->defaultProgram = 'Default program';
$lang->custom->modeManagement = 'Mode Management';
@@ -98,6 +98,10 @@ $lang->custom->project->defaultCurrency = 'Default Currency';
$lang->custom->project->fields['required'] = $lang->custom->required;
$lang->custom->project->fields['unitList'] = 'Unit List';
$lang->custom->execution = new stdClass();
$lang->custom->execution->fields['required'] = $lang->custom->required;
$lang->custom->execution->fields['execution'] = 'Close Setting';
$lang->custom->product = new stdClass();
$lang->custom->product->fields['required'] = $lang->custom->required;
$lang->custom->product->fields['browsestoryconcept'] = 'Story Concpet';
@@ -289,7 +293,7 @@ $lang->custom->CRKanban[0] = 'Change Forbidden';
$lang->custom->moduleName['product'] = $lang->productCommon;
$lang->custom->moduleName['productplan'] = 'Plan';
$lang->custom->moduleName['execution'] = $lang->custom->execution;
$lang->custom->moduleName['execution'] = $lang->custom->executionCommon;
$lang->custom->conceptQuestions['overview'] = "Quelle combinaison de gestion convient le mieux à votre entreprise ?";
$lang->custom->conceptQuestions['URAndSR'] = "Do you want to use the concept of {$lang->URCommon} and {$lang->SRCommon} in ZenTao?";
module/custom/lang/zh-cn.php
+8 -4
View File
@@ -55,7 +55,7 @@ $lang->custom->role = '职位';
$lang->custom->dept = '部门';
$lang->custom->code = $lang->code;
$lang->custom->setCode = '是否启用代号';
$lang->custom->execution = '执行';
$lang->custom->executionCommon = '执行';
$lang->custom->selectDefaultProgram = '请选择一个默认项目集';
$lang->custom->defaultProgram = '默认项目集';
$lang->custom->modeManagement = '模式管理';
@@ -85,7 +85,7 @@ $lang->custom->saveTips = '点击保存后，则以当前%s为默认
$lang->custom->numberError = '区间必须大于零';
$lang->custom->closedExecution = '已关闭' . $lang->custom->execution;
$lang->custom->closedExecution = '已关闭' . $lang->custom->executionCommon;
$lang->custom->closedKanban = '已关闭' . $lang->custom->kanban;
$lang->custom->closedProduct = '已关闭' . $lang->productCommon;
@@ -98,6 +98,10 @@ $lang->custom->project->defaultCurrency = '默认货币';
$lang->custom->project->fields['required'] = $lang->custom->required;
$lang->custom->project->fields['unitList'] = '预算单位';
$lang->custom->execution = new stdClass();
$lang->custom->execution->fields['required'] = $lang->custom->required;
$lang->custom->execution->fields['execution'] = '关闭设置';
$lang->custom->product = new stdClass();
$lang->custom->product->fields['required'] = $lang->custom->required;
$lang->custom->product->fields['browsestoryconcept'] = '需求概念';
@@ -185,7 +189,7 @@ $lang->custom->notice->required = '页面提交时，选中的字段
$lang->custom->notice->conceptResult = '我们已经根据您的选择为您设置了<b> %s-%s </b>模式，使用<b>%s</b> + <b> %s</b>。';
$lang->custom->notice->conceptPath = '您可以在：后台 -> 自定义 -> 流程页面修改。';
$lang->custom->notice->readOnlyOfProduct = '禁止修改后，已关闭' . $lang->productCommon . '下的' . $lang->SRCommon . '、Bug、用例、日志、发布、计划都禁止修改。';
$lang->custom->notice->readOnlyOfExecution = "禁止修改后，已关闭{$lang->custom->execution}下的任务、版本、日志以及关联需求都禁止修改。";
$lang->custom->notice->readOnlyOfExecution = "禁止修改后，已关闭{$lang->custom->executionCommon}下的任务、版本、日志以及关联需求都禁止修改。";
$lang->custom->notice->readOnlyOfKanban = "禁止修改后，已关闭{$lang->custom->kanban}下的卡片以及相关设置都禁止修改。";
$lang->custom->notice->URSREmpty = '自定义需求名称不能为空！';
$lang->custom->notice->valueEmpty = '值不能为空！';
@@ -289,7 +293,7 @@ $lang->custom->CRKanban[0] = '禁止修改';
$lang->custom->moduleName['product'] = $lang->productCommon;
$lang->custom->moduleName['productplan'] = '计划';
$lang->custom->moduleName['execution'] = $lang->custom->execution;
$lang->custom->moduleName['execution'] = $lang->custom->executionCommon;
$lang->custom->conceptQuestions['overview'] = "下述哪种组合方式更适合您公司的管理现状？";
$lang->custom->conceptQuestions['URAndSR'] = "是否启用{$lang->URCommon}和{$lang->SRCommon}概念？";
module/custom/view/execution.html.php
+34 -31
View File
@@ -10,38 +10,41 @@
*/
?>
<?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
<div id='mainContent' class='main-content'>
<form class="load-indicator main-form form-ajax" method='post'>
<div class='main-header'>
<div class='heading'>
<strong><?php echo $lang->custom->product->fields['product'];?></strong>
<div id='mainContent' class='main-row'>
<?php if($config->vision == 'rnd') include 'sidebar.html.php';?>
<div class='main-col main-content'>
<form class="load-indicator main-form form-ajax" method='post'>
<div class='main-header'>
<div class='heading'>
<strong><?php echo $lang->custom->product->fields['product'];?></strong>
</div>
</div>
</div>
<table class='table table-form'>
<tr>
<th class='w-150px'><?php echo $lang->custom->closedExecution;?></th>
<td class='w-300px text-left'>
<?php $checkedKey = isset($config->CRExecution) ? $config->CRExecution : 0;?>
<?php foreach($lang->custom->CRExecution as $key => $value):?>
<label class="radio-inline"><input type="radio" name="execution" value="<?php echo $key?>"<?php echo $key == $checkedKey ? " checked='checked'" : ''?> id="execution<?php echo $key;?>"><?php echo $value;?></label>
<?php endforeach;?>
</td>
<td></td>
</tr>
<tr>
<th></th>
<td colspan="2" id="readOnlyOfExecution">
<i class="icon-exclamation-sign"></i>&nbsp;<?php echo $lang->custom->notice->readOnlyOfExecution;?>
</td>
</tr>
<tr>
<th></th>
<td class='form-actions'>
<?php echo html::submitButton();?>
</td>
</tr>
</table>
</form>
<table class='table table-form'>
<tr>
<th class='w-150px'><?php echo $lang->custom->closedExecution;?></th>
<td class='w-300px text-left'>
<?php $checkedKey = isset($config->CRExecution) ? $config->CRExecution : 0;?>
<?php foreach($lang->custom->CRExecution as $key => $value):?>
<label class="radio-inline"><input type="radio" name="execution" value="<?php echo $key?>"<?php echo $key == $checkedKey ? " checked='checked'" : ''?> id="execution<?php echo $key;?>"><?php echo $value;?></label>
<?php endforeach;?>
</td>
<td></td>
</tr>
<tr>
<th></th>
<td colspan="2" id="readOnlyOfExecution">
<i class="icon-exclamation-sign"></i>&nbsp;<?php echo $lang->custom->notice->readOnlyOfExecution;?>
</td>
</tr>
<tr>
<th></th>
<td class='form-actions'>
<?php echo html::submitButton();?>
</td>
</tr>
</table>
</form>
</div>
</div>
<script>
$(function()
module/custom/view/required.html.php
+1 -1
View File
@@ -12,7 +12,7 @@
?>
<?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
<div id='mainContent' class='main-row'>
<?php if(!in_array($module, array('productplan', 'release', 'testsuite', 'testreport', 'caselib', 'doc')) and ($module != 'project' or ($module == 'project' and $config->vision == 'rnd'))) include 'sidebar.html.php';?>
<?php if(!in_array($module, array('productplan', 'release', 'testsuite', 'testreport', 'caselib', 'doc')) and (!in_array($module, array('project', 'execution')) or (in_array($module, array('project', 'execution')) and $config->vision == 'rnd'))) include 'sidebar.html.php';?>
<div class='main-col main-content'>
<form class="load-indicator main-form form-ajax" method='post'>
<div class='main-header'>
module/group/lang/resource.php
+1 -1
View File
@@ -1425,7 +1425,7 @@ $lang->resource->custom = new stdclass();
$lang->resource->custom->index = 'index';
$lang->resource->custom->set = 'set';
$lang->resource->custom->product = 'productName';
$lang->resource->custom->execution = 'execution';
$lang->resource->custom->execution = 'executionCommon';
$lang->resource->custom->required = 'required';
$lang->resource->custom->restore = 'restore';
$lang->resource->custom->flow = 'flow';