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

Merge branch 'tsj_fixbug' into 'master'

Browse Source 
Tsj fixbug

See merge request easycorp/zentaopms!7162
This commit is contained in:
王怡栋
2023-03-09 06:57:48 +00:00
parent 298bd4150b 6c4eb8b8c3
commit d4b93bccf4
23 changed files with 54 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/admin/model.php
+5
View File
@@ -320,6 +320,11 @@ class adminModel extends model
{
$menu['disabled'] = true;
if(!isset($menu['link'])) $menu['link'] = '';
if($menuKey == 'company')
{
$dept = $this->dao->select('id')->from(TABLE_DEPT)->fetch();
if($dept and common::hasPriv('company', 'browse')) $menu['link'] = helper::createLink('company', 'browse');
}
/* Set links to authorized navigation. */
if(isset($menu['subMenu']))
module/build/js/create.js
+2
View File
@@ -49,6 +49,8 @@ $().ready(function()
}
});
$('#product').change();
$('[data-toggle="popover"]').popover();
});
/**
module/build/view/create.html.php
+3 -1
View File
@@ -60,7 +60,9 @@
<tr class='hide'>
<th class='w-120px'><?php echo $lang->build->builds;?></th>
<td id='buildBox'><?php echo html::select('builds[]', array(), '', "class='form-control chosen' multiple data-placeholder='{$lang->build->placeholder->multipleSelect}'");?></td>
<td><?php echo $lang->build->notice->autoRelation;?></td>
<td>
<icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->build->notice->autoRelation;?>"></icon>
</td>
</tr>
<tr>
<th class='w-120px'><?php echo $lang->build->name;?></th>
module/common/lang/de.php
+2 -2
View File
@@ -339,7 +339,7 @@ $lang->searchObjects['caselib'] = 'Case Library';
$lang->searchObjects['testreport'] = 'Test-Bericht';
$lang->searchObjects['program'] = 'Program';
$lang->searchObjects['project'] = $lang->projectCommon;
$lang->searchObjects['execution'] = $lang->executionCommon;
$lang->searchObjects['execution'] = $lang->execution->common;
$lang->searchObjects['user'] = 'User';
$lang->searchTips = '';
@@ -363,7 +363,7 @@ $lang->visionList['lite'] = 'Operation Management Interface';
$lang->createObjects['todo'] = 'Todo';
$lang->createObjects['effort'] = 'Effort';
$lang->createObjects['bug'] = 'Bug';
$lang->createObjects['story'] = 'Story';
$lang->createObjects['story'] = $lang->SRCommon;
$lang->createObjects['task'] = 'Task';
$lang->createObjects['testcase'] = 'Case';
$lang->createObjects['execution'] = $lang->execution->common;
module/common/lang/en.php
+2 -2
View File
@@ -339,7 +339,7 @@ $lang->searchObjects['caselib'] = 'Case Library';
$lang->searchObjects['testreport'] = 'Test Report';
$lang->searchObjects['program'] = 'Program';
$lang->searchObjects['project'] = $lang->projectCommon;
$lang->searchObjects['execution'] = $lang->executionCommon;
$lang->searchObjects['execution'] = $lang->execution->common;
$lang->searchObjects['user'] = 'User';
$lang->searchTips = 'ID (ctrl+g)';
@@ -363,7 +363,7 @@ $lang->visionList['lite'] = 'Operation Management Interface';
$lang->createObjects['todo'] = 'Todo';
$lang->createObjects['effort'] = 'Effort';
$lang->createObjects['bug'] = 'Bug';
$lang->createObjects['story'] = 'Story';
$lang->createObjects['story'] = $lang->SRCommon;
$lang->createObjects['task'] = 'Task';
$lang->createObjects['testcase'] = 'Case';
$lang->createObjects['execution'] = $lang->execution->common;
module/common/lang/fr.php
+2 -2
View File
@@ -339,7 +339,7 @@ $lang->searchObjects['caselib'] = 'Case Library';
$lang->searchObjects['testreport'] = 'CR de Test';
$lang->searchObjects['program'] = 'Program';
$lang->searchObjects['project'] = $lang->projectCommon;
$lang->searchObjects['execution'] = $lang->executionCommon;
$lang->searchObjects['execution'] = $lang->execution->common;
$lang->searchObjects['user'] = 'User';
$lang->searchTips = '';
@@ -363,7 +363,7 @@ $lang->visionList['lite'] = 'Operation Management Interface';
$lang->createObjects['todo'] = 'Todo';
$lang->createObjects['effort'] = 'Effort';
$lang->createObjects['bug'] = 'Bug';
$lang->createObjects['story'] = 'Story';
$lang->createObjects['story'] = $lang->SRCommon;
$lang->createObjects['task'] = 'Task';
$lang->createObjects['testcase'] = 'Case';
$lang->createObjects['execution'] = $lang->execution->common;
module/common/lang/zh-cn.php
+3 -3
View File
@@ -339,7 +339,7 @@ $lang->searchObjects['caselib'] = '用例库';
$lang->searchObjects['testreport'] = '测试报告';
$lang->searchObjects['program'] = '项目集';
$lang->searchObjects['project'] = $lang->projectCommon;
$lang->searchObjects['execution'] = $lang->executionCommon;
$lang->searchObjects['execution'] = $lang->execution->common;
$lang->searchObjects['user'] = '用户';
$lang->searchTips = '编号(ctrl+g)';
@@ -363,10 +363,10 @@ $lang->visionList['lite'] = '运营管理界面';
$lang->createObjects['todo'] = '待办';
$lang->createObjects['effort'] = '日志';
$lang->createObjects['bug'] = 'Bug';
$lang->createObjects['story'] = '需求';
$lang->createObjects['story'] = $lang->SRCommon;
$lang->createObjects['task'] = '任务';
$lang->createObjects['testcase'] = '用例';
$lang->createObjects['execution'] = '执行';
$lang->createObjects['execution'] = $lang->execution->common;
$lang->createObjects['project'] = $lang->projectCommon;
$lang->createObjects['product'] = $lang->productCommon;
$lang->createObjects['program'] = '项目集';
module/common/model.php
+1 -1
View File
@@ -912,7 +912,7 @@ class commonModel extends model
$btnTitle = isset($lang->db->custom['common']['mainNav'][$tab]) ? $lang->db->custom['common']['mainNav'][$tab] : $lang->$tab->common;
$commonKey = $tab . 'Common';
if(isset($lang->$commonKey)) $btnTitle = $lang->$commonKey;
if(isset($lang->$commonKey) and $tab != 'execution') $btnTitle = $lang->$commonKey;
$link = helper::createLink($currentModule, $currentMethod);
$className = $tab == 'devops' ? 'btn num' : 'btn';
module/dev/model.php
+10
View File
@@ -820,6 +820,16 @@ class devModel extends model
if(!in_array($type, $this->config->dev->navTypes)) return $menuTree;
$mainNav = $type == 'second' ? $this->lang->mainNav : array();
if($this->config->vision != 'open' and $type == 'second')
{
$flowNav = $this->dao->select('module')->from(TABLE_WORKFLOW)
->where('buildin')->eq(0)
->andWhere('vision')->eq($this->config->vision)
->andWhere('navigator')->in('primary,secondary')
->fetchPairs();
foreach($flowNav as $nav) unset($mainNav->$nav);
}
if($type != 'second')
{
/* Set main nav list. */
module/execution/model.php
+7 -1
View File
@@ -59,7 +59,7 @@ class executionModel extends model
*/
public function getExecutionFeatures($execution)
{
$features = array('story' => true, 'task' => true, 'qa' => true, 'devops' => true, 'burn' => true, 'build' => true, 'other' => true);
$features = array('story' => true, 'task' => true, 'qa' => true, 'devops' => true, 'burn' => true, 'build' => true, 'other' => true, 'plan' => true);
/* Unset story, bug, build and testtask if type is ops. */
if($execution->lifetime == 'ops')
@@ -81,10 +81,16 @@ class executionModel extends model
if(in_array($execution->attribute, array('request', 'review')))
{
$features['story'] = false;
$features['plan'] = false;
}
}
}
if(isset($execution->projectInfo) and in_array($execution->projectInfo->model, array('waterfall', 'kanban', 'waterfallplus')) and empty($execution->projectInfo->hasProduct))
{
$features['plan'] = false;
}
return $features;
}
module/execution/view/create.html.php
+1 -1
View File
@@ -190,7 +190,7 @@
</tr>
<?php $i ++;?>
<?php endforeach;?>
<?php elseif(!empty($project) and empty($project->hasProduct) and strpos($project->model, 'waterfall') === false):?>
<?php elseif(!empty($project) and empty($project->hasProduct) and !in_array($project->model, array('waterfall', 'kanban', 'waterfallplus'))):?>
<tr>
<th><?php echo $lang->execution->linkPlan;?></th>
<td id="plansBox">
module/execution/view/view.html.php
+1 -1
View File
@@ -345,7 +345,7 @@
</div>
</div>
<?php endif;?>
<?php if(!(strpos($execution->projectInfo->model, 'waterfall') !== false and (empty($execution->projectInfo->hasProduct) or in_array($execution->attribute, array('request', 'review'))))):?>
<?php if($features['plan']):?>
<div class="detail">
<div class="detail-title"><strong><?php echo $lang->execution->linkPlan;?></strong></div>
<div class="detail-content">
module/product/lang/de.php
+1 -1
View File
@@ -62,7 +62,7 @@ $lang->product->doc = 'Dok';
$lang->product->project = $lang->executionCommon . 'Liste';
$lang->product->build = 'Build';
$lang->product->moreProduct = "More {$lang->productCommon}";
$lang->product->projectInfo = "{$lang->projectCommon}s that are linked to this {$lang->productCommon} are listed below.";
$lang->product->projectInfo = "My {$lang->projectCommon}s that are linked to this {$lang->productCommon} are listed below.";
$lang->product->progress = "Progress";
$lang->product->currentExecution = "Aktuelle Execution";
module/product/lang/en.php
+1 -1
View File
@@ -62,7 +62,7 @@ $lang->product->doc = "{$lang->productCommon} Documents";
$lang->product->project = $lang->executionCommon . ' List';
$lang->product->build = 'Build List';
$lang->product->moreProduct = "More {$lang->productCommon}";
$lang->product->projectInfo = "{$lang->projectCommon}s that are linked to this {$lang->productCommon} are listed below.";
$lang->product->projectInfo = "My {$lang->projectCommon}s that are linked to this {$lang->productCommon} are listed below.";
$lang->product->progress = "Progress";
$lang->product->currentExecution = "Current Execution";
module/product/lang/fr.php
+1 -1
View File
@@ -62,7 +62,7 @@ $lang->product->doc = "Documents {$lang->productCommon}";
$lang->product->project = ' Liste ' . $lang->executionCommon;
$lang->product->build = 'Liste Builds';
$lang->product->moreProduct = "More {$lang->productCommon}";
$lang->product->projectInfo = "Les {$lang->projectCommon}s qui sont associés à ce {$lang->productCommon} sont listés ci-dessous.";
$lang->product->projectInfo = "My {$lang->projectCommon}s that are linked to this {$lang->productCommon} are listed below.";
$lang->product->progress = "Progress";
$lang->product->currentExecution = "Current Execution";
module/product/lang/zh-cn.php
+1 -1
View File
@@ -62,7 +62,7 @@ $lang->product->doc = '文档列表';
$lang->product->project = $lang->executionCommon . '列表';
$lang->product->build = '版本列表';
$lang->product->moreProduct = "更多{$lang->productCommon}";
$lang->product->projectInfo = "所有与此{$lang->productCommon}关联的{$lang->projectCommon}";
$lang->product->projectInfo = "所有与此{$lang->productCommon}关联的我参与的{$lang->projectCommon}";
$lang->product->progress = "{$lang->productCommon}完成度";
$lang->product->currentExecution = "当前执行";
module/product/view/create.html.php
+1 -1
View File
@@ -21,7 +21,7 @@
<div class="main-header">
<h2><?php echo $lang->product->create;?></h2>
</div>
<form class="load-indicator main-form form-ajax" id="createForm" method="post" target='hiddenwin'>
<form class="load-indicator main-form form-ajax<?php if(defined('TUTORIAL')) echo ' not-watch';?>" id="createForm" method="post" target='hiddenwin'>
<table class="table table-form">
<tbody>
<?php if($this->config->systemMode == 'ALM'):?>
module/search/lang/de.php
+2 -2
View File
@@ -94,14 +94,14 @@ $lang->search->modules['testreport'] = 'Testing Report';
$lang->search->modules['productplan'] = 'Plan';
$lang->search->modules['program'] = 'Program';
$lang->search->modules['project'] = $lang->projectCommon;
$lang->search->modules['execution'] = $lang->executionCommon;
$lang->search->modules['execution'] = $lang->execution->common;
$lang->search->modules['story'] = $lang->SRCommon;
$lang->search->modules['requirement'] = $lang->URCommon;
$lang->search->objectTypeList['story'] = $lang->SRCommon;
$lang->search->objectTypeList['requirement'] = $lang->URCommon;
$lang->search->objectTypeList['stage'] = 'stage';
$lang->search->objectTypeList['sprint'] = $lang->executionCommon;
$lang->search->objectTypeList['sprint'] = $lang->execution->common;
$lang->search->objectTypeList['kanban'] = 'kanban';
$lang->search->objectTypeList['commonIssue'] = 'Issue';
$lang->search->objectTypeList['stakeholderIssue'] = 'Stakeholder Issue';
module/search/lang/en.php
+2 -2
View File
@@ -94,14 +94,14 @@ $lang->search->modules['testreport'] = 'Testing Report';
$lang->search->modules['productplan'] = 'Plan';
$lang->search->modules['program'] = 'Program';
$lang->search->modules['project'] = $lang->projectCommon;
$lang->search->modules['execution'] = $lang->executionCommon;
$lang->search->modules['execution'] = $lang->execution->common;
$lang->search->modules['story'] = $lang->SRCommon;
$lang->search->modules['requirement'] = $lang->URCommon;
$lang->search->objectTypeList['story'] = $lang->SRCommon;
$lang->search->objectTypeList['requirement'] = $lang->URCommon;
$lang->search->objectTypeList['stage'] = 'stage';
$lang->search->objectTypeList['sprint'] = $lang->executionCommon;
$lang->search->objectTypeList['sprint'] = $lang->execution->common;
$lang->search->objectTypeList['kanban'] = 'kanban';
$lang->search->objectTypeList['commonIssue'] = 'Issue';
$lang->search->objectTypeList['stakeholderIssue'] = 'Stakeholder Issue';
module/search/lang/fr.php
+2 -2
View File
@@ -94,14 +94,14 @@ $lang->search->modules['testreport'] = 'Testing Report';
$lang->search->modules['productplan'] = 'Plan';
$lang->search->modules['program'] = 'Program';
$lang->search->modules['project'] = $lang->projectCommon;
$lang->search->modules['execution'] = $lang->executionCommon;
$lang->search->modules['execution'] = $lang->execution->common;
$lang->search->modules['story'] = $lang->SRCommon;
$lang->search->modules['requirement'] = $lang->URCommon;
$lang->search->objectTypeList['story'] = $lang->SRCommon;
$lang->search->objectTypeList['requirement'] = $lang->URCommon;
$lang->search->objectTypeList['stage'] = 'stage';
$lang->search->objectTypeList['sprint'] = $lang->executionCommon;
$lang->search->objectTypeList['sprint'] = $lang->execution->common;
$lang->search->objectTypeList['kanban'] = 'kanban';
$lang->search->objectTypeList['commonIssue'] = 'Issue';
$lang->search->objectTypeList['stakeholderIssue'] = 'Stakeholder Issue';
module/search/lang/zh-cn.php
+2 -2
View File
@@ -94,14 +94,14 @@ $lang->search->modules['testreport'] = '测试报告';
$lang->search->modules['productplan'] = '计划';
$lang->search->modules['program'] = '项目集';
$lang->search->modules['project'] = $lang->projectCommon;
$lang->search->modules['execution'] = $lang->executionCommon;
$lang->search->modules['execution'] = $lang->execution->common;
$lang->search->modules['story'] = $lang->SRCommon;
$lang->search->modules['requirement'] = $lang->URCommon;
$lang->search->objectTypeList['story'] = $lang->SRCommon;
$lang->search->objectTypeList['requirement'] = $lang->URCommon;
$lang->search->objectTypeList['stage'] = '阶段';
$lang->search->objectTypeList['sprint'] = $lang->executionCommon;
$lang->search->objectTypeList['sprint'] = $lang->execution->common;
$lang->search->objectTypeList['kanban'] = '看板';
$lang->search->objectTypeList['commonIssue'] = '问题';
$lang->search->objectTypeList['stakeholderIssue'] = '干系人问题';
module/story/view/linkstories.html.php
+1 -1
View File
@@ -59,7 +59,7 @@
<?php if(!empty($product->shadow)):?>
<td class='nobr' title="<?php echo $products[$story2Link->product]?>"><?php echo html::a($this->createLink('product', 'browse', "productID=$story2Link->product&branch=$story2Link->branch"), $products[$story2Link->product], '_blank');?></td>
<?php endif;?>
<td class='text-left nobr' title="<?php echo $story2Link->title?>"><?php echo html::a($storyLink, $story2Link->title);?></td>
<td class='text-left nobr' title="<?php echo $story2Link->title?>"><?php echo $story2Link->title;?></td>
<td><?php echo $this->processStatus('story', $story2Link);?></td>
<td><?php echo zget($users, $story2Link->openedBy);?></td>
<td><?php echo zget($users, $story2Link->assignedTo);?></td>
module/testcase/view/caseheader.html.php
+1 -1
View File
@@ -21,7 +21,7 @@
#byTypeTab li.split{border-top: 1px solid #eee;}
</style>
<div id='mainMenu' class='clearfix'>
<?php if(!in_array($this->app->rawMethod, array('groupcase', 'browseunits'))):?>
<?php if($this->app->rawMethod == 'browse'):?>
<div id="sidebarHeader">
<div class="title">
<?php