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

Merge branch 'sprint/285_tsj' into 'sprint/285'

Browse Source 
Sprint/285 tsj

See merge request easycorp/zentaopms!6898
This commit is contained in:
王怡栋
2023-02-09 05:09:06 +00:00
parent 6f48c9f367 bd95b1eb84
commit 9be9451a12
20 changed files with 49 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/custom/ext/lang/de/lite.php
-17
View File
@@ -5,23 +5,6 @@ $lang->custom->notice->readOnlyOfExecution = "If Change Forbidden, any change on
$lang->custom->moduleName['execution'] = $lang->custom->execution;
$lang->custom->object = array();
$lang->custom->object['execution'] = $lang->custom->execution;
$lang->custom->object['story'] = $lang->SRCommon;
$lang->custom->object['task'] = 'Task';
$lang->custom->object['todo'] = 'Todo';
$lang->custom->object['user'] = 'User';
$lang->custom->object['block'] = 'Block';
$lang->custom->object['project'] = $lang->projectCommon;
$lang->custom->menuOrder = array();
$lang->custom->menuOrder[10] = 'execution';
$lang->custom->menuOrder[15] = 'story';
$lang->custom->menuOrder[20] = 'task';
$lang->custom->menuOrder[25] = 'todo';
$lang->custom->menuOrder[30] = 'user';
$lang->custom->menuOrder[35] = 'block';
$lang->custom->task = new stdClass();
$lang->custom->task->fields['required'] = $lang->custom->required;
$lang->custom->task->fields['priList'] = 'Priority';
extension/lite/custom/ext/lang/en/lite.php
-17
View File
@@ -5,23 +5,6 @@ $lang->custom->notice->readOnlyOfExecution = "If Change Forbidden, any change on
$lang->custom->moduleName['execution'] = $lang->custom->execution;
$lang->custom->object = array();
$lang->custom->object['execution'] = $lang->custom->execution;
$lang->custom->object['story'] = $lang->SRCommon;
$lang->custom->object['task'] = 'Task';
$lang->custom->object['todo'] = 'Todo';
$lang->custom->object['user'] = 'User';
$lang->custom->object['block'] = 'Block';
$lang->custom->object['project'] = $lang->projectCommon;
$lang->custom->menuOrder = array();
$lang->custom->menuOrder[10] = 'execution';
$lang->custom->menuOrder[15] = 'story';
$lang->custom->menuOrder[20] = 'task';
$lang->custom->menuOrder[25] = 'todo';
$lang->custom->menuOrder[30] = 'user';
$lang->custom->menuOrder[35] = 'block';
$lang->custom->task = new stdClass();
$lang->custom->task->fields['required'] = $lang->custom->required;
$lang->custom->task->fields['priList'] = 'Priority';
extension/lite/custom/ext/lang/fr/lite.php
-17
View File
@@ -5,23 +5,6 @@ $lang->custom->notice->readOnlyOfExecution = "If Change Forbidden, any change on
$lang->custom->moduleName['execution'] = $lang->custom->execution;
$lang->custom->object = array();
$lang->custom->object['execution'] = $lang->custom->execution;
$lang->custom->object['story'] = $lang->SRCommon;
$lang->custom->object['task'] = 'Task';
$lang->custom->object['todo'] = 'Todo';
$lang->custom->object['user'] = 'User';
$lang->custom->object['block'] = 'Block';
$lang->custom->object['project'] = $lang->projectCommon;
$lang->custom->menuOrder = array();
$lang->custom->menuOrder[10] = 'execution';
$lang->custom->menuOrder[15] = 'story';
$lang->custom->menuOrder[20] = 'task';
$lang->custom->menuOrder[25] = 'todo';
$lang->custom->menuOrder[30] = 'user';
$lang->custom->menuOrder[35] = 'block';
$lang->custom->task = new stdClass();
$lang->custom->task->fields['required'] = $lang->custom->required;
$lang->custom->task->fields['priList'] = 'Priority';
extension/lite/custom/ext/lang/zh-cn/lite.php
-17
View File
@@ -5,23 +5,6 @@ $lang->custom->notice->readOnlyOfExecution = "禁止修改后，已关闭{$lang-
$lang->custom->moduleName['execution'] = $lang->custom->execution;
$lang->custom->object = array();
$lang->custom->object['execution'] = $lang->custom->execution;
$lang->custom->object['story'] = $lang->SRCommon;
$lang->custom->object['task'] = '任务';
$lang->custom->object['todo'] = '待办';
$lang->custom->object['user'] = '用户';
$lang->custom->object['block'] = '区块';
$lang->custom->object['project'] = $lang->projectCommon;
$lang->custom->menuOrder = array();
$lang->custom->menuOrder[10] = 'execution';
$lang->custom->menuOrder[15] = 'story';
$lang->custom->menuOrder[20] = 'task';
$lang->custom->menuOrder[25] = 'todo';
$lang->custom->menuOrder[30] = 'user';
$lang->custom->menuOrder[35] = 'block';
$lang->custom->task = new stdClass();
$lang->custom->task->fields['required'] = $lang->custom->required;
$lang->custom->task->fields['priList'] = '优先级';
extension/lite/group/ext/lang/resource.php
+1 -1
View File
@@ -648,7 +648,7 @@ $lang->mail->methodOrder[65] = 'ztCloud';
$lang->resource->custom = new stdclass();
$lang->resource->custom->index = 'index';
$lang->resource->custom->set = 'set';
$lang->resource->custom->product = 'product';
$lang->resource->custom->product = 'productName';
$lang->resource->custom->execution = 'execution';
$lang->resource->custom->restore = 'restore';
$lang->resource->custom->flow = 'flow';
module/admin/config.php
+12 -5
View File
@@ -20,15 +20,15 @@ $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', 'feedback', 'user', 'block', 'story', 'task', 'bug', 'testcase', 'testtask', 'feedback', 'user');
$config->admin->menuModuleGroup['feature']['custom|required'] = array('bug', 'doc', 'product', 'story', 'productplan', 'release', 'task', 'bug', 'testcase', 'testsuite', 'testtask', 'testreport', 'caselib', 'doc', 'feedback', 'user');
$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['template']['custom|set'] = array('baseline');
if($config->vision == 'lite')
{
$config->admin->menuModuleGroup['model']['custom|set'] = array('issue', 'risk', 'opportunity', 'nc');
$config->admin->menuModuleGroup['model']['custom|set'] = array();
$config->admin->menuModuleGroup['model']['custom|required'] = array('build');
$config->admin->menuModuleGroup['feature']['custom|set'] = array('project', 'todo', 'feedback', 'user', 'block', 'story', 'task', 'bug', 'testcase', 'testtask', 'feedback', 'user');
$config->admin->menuModuleGroup['feature']['custom|required'] = array('project', 'task', 'story');
$config->admin->menuModuleGroup['feature']['custom|set'] = array('todo', 'block', 'task', 'story', 'user');
$config->admin->menuModuleGroup['feature']['custom|required'] = array('project', 'task', 'story', 'doc', 'user');
}
$config->admin->plugins[203] = new stdClass();
@@ -84,3 +84,10 @@ $config->admin->helpURL['message'] = 'https://www.zentao.net/book/zentaopms/em
$config->admin->helpURL['extension'] = 'https://www.zentao.net/book/zentaopms/536.html';
$config->admin->helpURL['dev'] = 'https://www.zentao.net/book/zentaopms/537.html';
$config->admin->helpURL['convert'] = 'https://www.zentao.net/book/zentaopms/656.html';
$config->admin->navsGroup['my'] = ',todo,block,';
$config->admin->navsGroup['product'] = ',product,story,productplan,release,';
$config->admin->navsGroup['execution'] = ',execution,';
$config->admin->navsGroup['project'] = ',project,story,';
$config->admin->navsGroup['qa'] = ',bug,testcase,testsuite,testtask,testreport,caselib,';
if($config->vision == 'lite') $config->admin->navsGroup['my'] .= 'task,';
module/admin/js/index.js
+2 -2
View File
@@ -1,8 +1,8 @@
$(function()
{
$(document).on('click', '.setting-box', function()
$(document).on('click', '.setting-box > button', function()
{
location.href = $(this).data('link');
location.href = $(this).attr('data-link');
}).on('click', '.setting-box a', function(e)
{
e.stopPropagation();
module/admin/lang/menu.php
+2 -2
View File
@@ -89,7 +89,7 @@ $lang->admin->menuList->feature['subMenu']['execution'] = array('link' => "{$l
$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');
$lang->admin->menuList->feature['subMenu']['user'] = array('link' => "{$lang->user->common}|custom|set|module=user", 'exclude' => 'set,required');
$lang->admin->menuList->feature['subMenu']['user'] = array('link' => "{$lang->user->common}|custom|required|module=user", 'links' => array('custom|set|module=user&field=roleList'), 'exclude' => 'set,required');
$lang->admin->menuList->feature['tabMenu']['my']['todo'] = array('link' => "{$lang->todo->common}|custom|set|module=todo&field=priList", 'exclude' => 'custom-set');
$lang->admin->menuList->feature['tabMenu']['my']['block'] = array('link' => "{$lang->block->common}|custom|set|module=block&field=closed", 'exclude' => 'custom-set');
@@ -140,7 +140,7 @@ $lang->admin->menuList->dev['menuOrder']['10'] = 'db';
$lang->admin->menuList->dev['menuOrder']['15'] = 'editor';
$lang->admin->menuList->dev['menuOrder']['20'] = 'entry';
if($config->edition != 'max') unset($lang->admin->menuList->model['subMenu']['scrum'], $lang->admin->menuList->model['menuOrder']['10']);
if($config->edition != 'max') unset($lang->admin->menuList->model['subMenu']['scrum'], $lang->admin->menuList->model['menuOrder']['10'], $lang->admin->menuList->template);
if(!helper::hasFeature('waterfall'))
{
unset($lang->admin->menuList->model['subMenu']['waterfall']);
module/admin/model.php
+2 -6
View File
@@ -279,12 +279,8 @@ class adminModel extends model
$subModule = '';
if($moduleName == 'custom' and strpos(',required,set,', $methodName) !== false)
{
if(strpos(',todo,block,', ",$paramName,") !== false and $subMenuKey == 'my') $subModule = 'custom';
if(strpos(',product,story,productplan,release,', ",$paramName,") !== false and $subMenuKey == 'product') $subModule = 'custom';
if(strpos(',task,', ",$paramName,") !== false and $subMenuKey == 'execution') $subModule = 'custom';
if(strpos(',project,story,', ",$paramName,") !== false and $subMenuKey == 'project') $subModule = 'custom';
if(strpos(',bug,testcase,testsuite,testtask,testreport,caselib,', ",$paramName,") !== false and $subMenuKey == 'qa') $subModule = 'custom';
if($this->config->vision == 'lite' and $paramName == 'task' and $subMenuKey == 'my') $subModule = 'custom';
if(isset($this->config->admin->navsGroup[$subMenuKey]) and strpos($this->config->admin->navsGroup[$subMenuKey], ",$paramName,") !== false) $subModule = 'custom';
if($paramName == $subMenuKey) $subModule = 'custom';
}
if(!empty($subModule)) $subMenu['subModule'] = $subModule;
module/custom/lang/de.php
+1 -39
View File
@@ -89,45 +89,6 @@ $lang->custom->closedExecution = 'Closed ' . $lang->executionCommon;
$lang->custom->closedKanban = 'Closed ' . $lang->custom->kanban;
$lang->custom->closedProduct = 'Closed ' . $lang->productCommon;
$lang->custom->object['project'] = 'Project';
$lang->custom->object['product'] = $lang->productCommon;
$lang->custom->object['execution'] = $lang->custom->execution;
$lang->custom->object['kanban'] = $lang->custom->kanban;
$lang->custom->object['story'] = 'Story';
$lang->custom->object['task'] = 'Task';
$lang->custom->object['bug'] = 'Bug';
$lang->custom->object['testcase'] = 'Case';
$lang->custom->object['testtask'] = 'Build';
$lang->custom->object['todo'] = 'Todo';
$lang->custom->object['user'] = 'User';
$lang->custom->object['block'] = 'ClosedBlock';
$lang->custom->object['flow'] = 'Flow';
$lang->custom->object['score'] = 'Score';
$lang->custom->object['mode'] = 'Mode';
$lang->custom->object['productplan'] = 'Plan';
$lang->custom->object['release'] = 'Release';
$lang->custom->object['testsuite'] = 'Test Suite';
$lang->custom->object['testreport'] = 'Test Report';
$lang->custom->object['caselib'] = 'Case Library';
$lang->custom->menuOrder[5] = 'project';
$lang->custom->menuOrder[10] = 'product';
$lang->custom->menuOrder[15] = 'execution';
$lang->custom->menuOrder[20] = 'kanban';
$lang->custom->menuOrder[25] = 'story';
$lang->custom->menuOrder[30] = 'task';
$lang->custom->menuOrder[35] = 'bug';
$lang->custom->menuOrder[40] = 'testcase';
$lang->custom->menuOrder[45] = 'testtask';
$lang->custom->menuOrder[50] = 'todo';
$lang->custom->menuOrder[55] = 'user';
$lang->custom->menuOrder[60] = 'block';
$lang->custom->menuOrder[65] = 'flow';
$lang->custom->menuOrder[70] = 'score';
$lang->custom->dividerMenu = ',story,todo,block,';
$lang->custom->separatePage = ',execution,product,kanban,flow,score,';
$lang->custom->block = new stdclass();
$lang->custom->block->fields['closed'] = 'Closed Block';
@@ -199,6 +160,7 @@ $lang->custom->todo->fields['typeList'] = 'Type';
$lang->custom->todo->fields['statusList'] = 'Status';
$lang->custom->user = new stdClass();
$lang->custom->user->fields['required'] = $lang->custom->required;
$lang->custom->user->fields['roleList'] = 'Role';
$lang->custom->user->fields['statusList'] = 'Status';
$lang->custom->user->fields['contactField'] = 'Available Contact';
module/custom/lang/en.php
+1 -39
View File
@@ -89,45 +89,6 @@ $lang->custom->closedExecution = 'Closed ' . $lang->executionCommon;
$lang->custom->closedKanban = 'Closed ' . $lang->custom->kanban;
$lang->custom->closedProduct = 'Closed ' . $lang->productCommon;
$lang->custom->object['project'] = 'Project';
$lang->custom->object['product'] = $lang->productCommon;
$lang->custom->object['execution'] = $lang->custom->execution;
$lang->custom->object['kanban'] = $lang->custom->kanban;
$lang->custom->object['story'] = 'Story';
$lang->custom->object['task'] = 'Task';
$lang->custom->object['bug'] = 'Bug';
$lang->custom->object['testcase'] = 'Case';
$lang->custom->object['testtask'] = 'Request';
$lang->custom->object['todo'] = 'Todo';
$lang->custom->object['user'] = 'User';
$lang->custom->object['block'] = 'Block';
$lang->custom->object['flow'] = 'Flow';
$lang->custom->object['score'] = 'Score';
$lang->custom->object['mode'] = 'Mode';
$lang->custom->object['productplan'] = 'Plan';
$lang->custom->object['release'] = 'Release';
$lang->custom->object['testsuite'] = 'Test Suite';
$lang->custom->object['testreport'] = 'Test Report';
$lang->custom->object['caselib'] = 'Case Library';
$lang->custom->menuOrder[5] = 'project';
$lang->custom->menuOrder[10] = 'product';
$lang->custom->menuOrder[15] = 'execution';
$lang->custom->menuOrder[20] = 'kanban';
$lang->custom->menuOrder[25] = 'story';
$lang->custom->menuOrder[30] = 'task';
$lang->custom->menuOrder[35] = 'bug';
$lang->custom->menuOrder[40] = 'testcase';
$lang->custom->menuOrder[45] = 'testtask';
$lang->custom->menuOrder[50] = 'todo';
$lang->custom->menuOrder[55] = 'user';
$lang->custom->menuOrder[60] = 'block';
$lang->custom->menuOrder[65] = 'flow';
$lang->custom->menuOrder[70] = 'score';
$lang->custom->dividerMenu = ',story,todo,block,';
$lang->custom->separatePage = ',execution,product,kanban,flow,score,';
$lang->custom->block = new stdclass();
$lang->custom->block->fields['closed'] = 'Closed Block';
@@ -199,6 +160,7 @@ $lang->custom->todo->fields['typeList'] = 'Type';
$lang->custom->todo->fields['statusList'] = 'Status';
$lang->custom->user = new stdClass();
$lang->custom->user->fields['required'] = $lang->custom->required;
$lang->custom->user->fields['roleList'] = 'Role';
$lang->custom->user->fields['statusList'] = 'Status';
$lang->custom->user->fields['contactField'] = 'Available Contact';
module/custom/lang/fr.php
+1 -39
View File
@@ -89,45 +89,6 @@ $lang->custom->closedExecution = 'Closed ' . $lang->executionCommon;
$lang->custom->closedKanban = 'Closed ' . $lang->custom->kanban;
$lang->custom->closedProduct = 'Closed ' . $lang->productCommon;
$lang->custom->object['project'] = 'Project';
$lang->custom->object['product'] = $lang->productCommon;
$lang->custom->object['execution'] = $lang->custom->execution;
$lang->custom->object['kanban'] = $lang->custom->kanban;
$lang->custom->object['story'] = 'Story';
$lang->custom->object['task'] = 'Tâche';
$lang->custom->object['bug'] = 'Bug';
$lang->custom->object['testcase'] = 'CasTest';
$lang->custom->object['testtask'] = 'Build';
$lang->custom->object['todo'] = 'Agenda';
$lang->custom->object['user'] = 'Utilisateur';
$lang->custom->object['block'] = 'Bloc';
$lang->custom->object['flow'] = 'Flow';
$lang->custom->object['score'] = 'Score';
$lang->custom->object['mode'] = 'Mode';
$lang->custom->object['productplan'] = 'Plan';
$lang->custom->object['release'] = 'Release';
$lang->custom->object['testsuite'] = 'Test Suite';
$lang->custom->object['testreport'] = 'Test Report';
$lang->custom->object['caselib'] = 'Case Library';
$lang->custom->menuOrder[5] = 'project';
$lang->custom->menuOrder[10] = 'product';
$lang->custom->menuOrder[15] = 'execution';
$lang->custom->menuOrder[20] = 'kanban';
$lang->custom->menuOrder[25] = 'story';
$lang->custom->menuOrder[30] = 'task';
$lang->custom->menuOrder[35] = 'bug';
$lang->custom->menuOrder[40] = 'testcase';
$lang->custom->menuOrder[45] = 'testtask';
$lang->custom->menuOrder[50] = 'todo';
$lang->custom->menuOrder[55] = 'user';
$lang->custom->menuOrder[60] = 'block';
$lang->custom->menuOrder[65] = 'flow';
$lang->custom->menuOrder[70] = 'score';
$lang->custom->dividerMenu = ',story,todo,block,';
$lang->custom->separatePage = ',execution,product,kanban,flow,score,';
$lang->custom->block = new stdclass();
$lang->custom->block->fields['closed'] = 'Bloc Fermé';
@@ -199,6 +160,7 @@ $lang->custom->todo->fields['typeList'] = 'Type';
$lang->custom->todo->fields['statusList'] = 'Statut';
$lang->custom->user = new stdClass();
$lang->custom->user->fields['required'] = $lang->custom->required;
$lang->custom->user->fields['roleList'] = 'Rôle';
$lang->custom->user->fields['statusList'] = 'Statut';
$lang->custom->user->fields['contactField'] = 'Contact';
module/custom/lang/zh-cn.php
+1 -39
View File
@@ -89,45 +89,6 @@ $lang->custom->closedExecution = '已关闭' . $lang->custom->execution;
$lang->custom->closedKanban = '已关闭' . $lang->custom->kanban;
$lang->custom->closedProduct = '已关闭' . $lang->productCommon;
$lang->custom->object['project'] = '项目';
$lang->custom->object['product'] = $lang->productCommon;
$lang->custom->object['execution'] = $lang->custom->execution;
$lang->custom->object['kanban'] = $lang->custom->kanban;
$lang->custom->object['story'] = $lang->SRCommon;
$lang->custom->object['task'] = '任务';
$lang->custom->object['bug'] = 'Bug';
$lang->custom->object['testcase'] = '用例';
$lang->custom->object['testtask'] = '测试单';
$lang->custom->object['todo'] = '待办';
$lang->custom->object['user'] = '用户';
$lang->custom->object['block'] = '区块';
$lang->custom->object['flow'] = '流程';
$lang->custom->object['score'] = '积分';
$lang->custom->object['mode'] = '模式';
$lang->custom->object['productplan'] = '计划';
$lang->custom->object['release'] = '发布';
$lang->custom->object['testsuite'] = '套件';
$lang->custom->object['testreport'] = '测试报告';
$lang->custom->object['caselib'] = '用例库';
$lang->custom->menuOrder[5] = 'project';
$lang->custom->menuOrder[10] = 'product';
$lang->custom->menuOrder[15] = 'execution';
$lang->custom->menuOrder[20] = 'kanban';
$lang->custom->menuOrder[25] = 'story';
$lang->custom->menuOrder[30] = 'task';
$lang->custom->menuOrder[35] = 'bug';
$lang->custom->menuOrder[40] = 'testcase';
$lang->custom->menuOrder[45] = 'testtask';
$lang->custom->menuOrder[50] = 'todo';
$lang->custom->menuOrder[55] = 'user';
$lang->custom->menuOrder[60] = 'block';
$lang->custom->menuOrder[65] = 'flow';
$lang->custom->menuOrder[70] = 'score';
$lang->custom->dividerMenu = ',story,todo,block,';
$lang->custom->separatePage = ',execution,product,kanban,flow,score';
$lang->custom->block = new stdclass();
$lang->custom->block->fields['closed'] = '关闭的区块';
@@ -199,6 +160,7 @@ $lang->custom->todo->fields['typeList'] = '类型';
$lang->custom->todo->fields['statusList'] = '状态';
$lang->custom->user = new stdClass();
$lang->custom->user->fields['required'] = $lang->custom->required;
$lang->custom->user->fields['roleList'] = '职位';
$lang->custom->user->fields['statusList'] = '状态';
$lang->custom->user->fields['contactField'] = '可用联系方式';
module/custom/view/execution.html.php
+5
View File
@@ -12,6 +12,11 @@
<?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>
</div>
<table class='table table-form'>
<tr>
<th class='w-150px'><?php echo $lang->custom->closedExecution;?></th>
module/custom/view/kanban.html.php
+5
View File
@@ -12,6 +12,11 @@
<?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>
</div>
<table class='table table-form'>
<tr>
<th class='w-150px'><?php echo $lang->custom->closedKanban;?></th>
module/custom/view/product.html.php
+5
View File
@@ -14,6 +14,11 @@
<?php 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->$module->fields['product'];?></strong>
</div>
</div>
<table class='table table-form'>
<tr>
<th class='w-150px'><?php echo $lang->custom->closedProduct;?></th>
module/custom/view/required.html.php
+2 -2
View File
@@ -12,12 +12,12 @@
?>
<?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')) 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 ($module != 'project' or ($module == 'project' 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'>
<div class='heading'>
<strong><?php echo $lang->custom->object[$module] . $lang->arrow . $lang->custom->required;?></strong>
<strong><?php echo $lang->custom->required;?></strong>
</div>
</div>
<table class='table table-form mw-800px'>
module/custom/view/set.html.php
+1 -1
View File
@@ -53,7 +53,7 @@ EOT;
<form class="load-indicator main-form form-ajax" method='post'>
<div class='main-header'>
<div class='heading'>
<strong><?php echo $lang->custom->object[$module] . $lang->arrow . $lang->custom->$module->fields[$field]?></strong>
<strong><?php echo $lang->custom->$module->fields[$field]?></strong>
</div>
</div>
<?php if($module == 'project' and $field == 'unitList'):?>
module/custom/view/sidebar.html.php
+7
View File
@@ -14,6 +14,13 @@
$active = (isset($field) and $field == $key) ? 'active' : $active;
}
if($module == 'approvalflow' and in_array($key, array('project', 'workflow')))
{
$method = 'browse';
$params = "type=$key";
$active = (isset($type) and $type == $key) ? 'active' : $active;
}
if(common::hasPriv('custom', $method)) echo html::a(inlink($method, $params), $value, '', "class='$active'");
}
?>
module/group/control.php
+1 -1
View File
@@ -236,7 +236,7 @@ class group extends control
}
$this->lang->custom->common = $this->lang->group->config;
if($this->config->edition == 'max') $this->lang->baseline->common = $this->lang->group->docTemplate;
if($this->config->edition == 'max' and $this->config->vision == 'rnd') $this->lang->baseline->common = $this->lang->group->docTemplate;
$this->view->group = $group;
$this->view->changelogs = ',' . join(',', $changelog) . ',';