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

Merge branch 'master' into 'zentaopms_263_task#77131'

Browse Source 
# Conflicts:
#   module/build/lang/de.php
#   module/build/lang/en.php
#   module/build/lang/fr.php
#   module/build/lang/zh-cn.php
This commit is contained in:
王 于听
2022-11-22 07:04:14 +00:00
parent befbe1f3d7 c8abe9f23a
commit 81b50aa44b
14 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/build/lang/de.php
+2 -1
View File
@@ -34,7 +34,8 @@ $lang->build->branch = 'Platform/Branch';
$lang->build->branchName = '%s';
$lang->build->execution = $lang->executionCommon;
$lang->build->integrated = 'Integrated';
$lang->build->builds = 'Included Builds';
$lang->build->singled = 'Singled';
$lang->build->builds = 'Linked Builds';
$lang->build->name = 'Name';
$lang->build->date = 'Datum';
$lang->build->builder = 'Builder';
module/build/lang/en.php
+2 -1
View File
@@ -34,7 +34,8 @@ $lang->build->branch = 'Platform/Branch';
$lang->build->branchName = '%s';
$lang->build->execution = $lang->executionCommon;
$lang->build->integrated = 'Integrated';
$lang->build->builds = 'Included Builds';
$lang->build->singled = 'Singled';
$lang->build->builds = 'Linked Builds';
$lang->build->name = 'Name';
$lang->build->date = 'Date';
$lang->build->builder = 'Builder';
module/build/lang/fr.php
+2 -1
View File
@@ -34,7 +34,8 @@ $lang->build->branch = 'Plateforme/Branche';
$lang->build->branchName = '%s';
$lang->build->execution = $lang->executionCommon;
$lang->build->integrated = 'Integrated';
$lang->build->builds = 'Included Builds';
$lang->build->singled = 'Singled';
$lang->build->builds = 'Linked Builds';
$lang->build->name = 'Nom';
$lang->build->date = 'Date';
$lang->build->builder = 'Builder';
module/build/lang/zh-cn.php
+2 -1
View File
@@ -34,7 +34,8 @@ $lang->build->branch = '平台/分支';
$lang->build->branchName = '所属%s';
$lang->build->execution = '所属' . $lang->executionCommon;
$lang->build->integrated = '集成版本';
$lang->build->builds = '包含版本';
$lang->build->singled = '单一版本';
$lang->build->builds = '关联版本';
$lang->build->name = '名称编号';
$lang->build->date = '打包日期';
$lang->build->builder = '构建者';
module/product/view/project.html.php
+1 -1
View File
@@ -74,7 +74,7 @@
<td class='text-left'>
<?php
$projectType = $project->model == 'scrum' ? 'sprint' : $project->model;
echo html::a($this->createLink('project', 'index', 'project=' . $project->id), "<i class='text-muted icon icon-{$projectType}'></i> " . $project->name, '', "title='{$project->name} ({$lang->project->{$project->model}})'");
echo html::a($this->createLink('project', 'index', 'project=' . $project->id), "<i class='text-muted icon icon-{$projectType}'></i> " . $project->name, '', "title='$project->name'");
?>
</td>
<?php if(strpos('all,undone', $status) !== false):?>
module/project/lang/de.php
+2 -2
View File
@@ -182,8 +182,8 @@ $lang->project->kanban = 'Kanban';
/* Project Kanban. */
$lang->project->projectTypeList = array();
$lang->project->projectTypeList[1] = 'Has Product';
$lang->project->projectTypeList[0] = 'No Product';
$lang->project->projectTypeList[1] = 'Product-based';
$lang->project->projectTypeList[0] = 'Non-product-based';
/* Project Kanban. */
$lang->project->typeList = array();
module/project/lang/en.php
+2 -2
View File
@@ -182,8 +182,8 @@ $lang->project->kanban = 'Kanban';
/* Project Kanban. */
$lang->project->projectTypeList = array();
$lang->project->projectTypeList[1] = 'Has Product';
$lang->project->projectTypeList[0] = 'No Product';
$lang->project->projectTypeList[1] = 'Product-based';
$lang->project->projectTypeList[0] = 'Non-product-based';
/* Project Kanban. */
$lang->project->typeList = array();
module/project/lang/fr.php
+2 -2
View File
@@ -182,8 +182,8 @@ $lang->project->kanban = 'Kanban';
/* Project Kanban. */
$lang->project->projectTypeList = array();
$lang->project->projectTypeList[1] = 'Has Product';
$lang->project->projectTypeList[0] = 'No Product';
$lang->project->projectTypeList[1] = 'Product-based';
$lang->project->projectTypeList[0] = 'Non-product-based';
/* Project Kanban. */
$lang->project->typeList = array();
module/project/lang/vi.php
+2 -2
View File
@@ -182,8 +182,8 @@ $lang->project->kanban = 'Kanban';
/* Project Kanban. */
$lang->project->projectTypeList = array();
$lang->project->projectTypeList[1] = 'Has Product';
$lang->project->projectTypeList[0] = 'No Product';
$lang->project->projectTypeList[1] = 'Product-based';
$lang->project->projectTypeList[0] = 'Non-product-based';
/* Project Kanban. */
$lang->project->typeList = array();
module/project/view/build.html.php
+1
View File
@@ -71,6 +71,7 @@
<tr data-id="<?php echo $productID;?>">
<td class="c-id-sm text-muted"><?php echo html::a(helper::createLink($module, 'view', "buildID=$build->id"), sprintf('%03d', $build->id), '', "data-app='project'");?></td>
<td class="c-name" title='<?php echo $build->name;?>'>
<span class='label label-outline label-info'><?php echo $build->execution ? $lang->build->singled : $lang->build->integrated;?></span>
<?php if($build->branchName) echo "<span class='label label-outline label-badge'>{$build->branchName}</span>"?>
<?php echo html::a($this->createLink($module, 'view', "buildID=$build->id"), $build->name, '', "data-app='project'");?>
</td>
module/testcase/control.php
-1
View File
@@ -321,7 +321,6 @@ class testcase extends control
if($this->app->tab == 'project')
{
$this->loadModel('project')->setMenu($this->session->project);
$this->app->rawModule = 'qa';
$products = $this->product->getProducts($this->session->project, 'all', '', false);
$productID = $this->product->saveState($productID, $products);
$this->lang->modulePageNav = $this->product->select($products, $productID, 'testcase', 'zeroCase', "projectID=$projectID", $branchID);
module/testcase/js/zerocase.js
+1
View File
@@ -1,4 +1,5 @@
$(document).ready(function()
{
$('#zerocaseTab').addClass('btn-active-text');
$('.pager').attr('data-app', tab);
});
module/testcase/view/zerocase.html.php
+1
View File
@@ -13,6 +13,7 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../testcase/view/caseheader.html.php';?>
<?php js::set('resetActive', false);?>
<?php js::set('tab', $app->tab);?>
<div id='mainContent' class='main-control'>
<?php if(empty($stories)):?>
<div class="table-empty-tip">
www/theme/default/style.css
+1 -1
View File
@@ -189,7 +189,7 @@ tbody tr td.c-actions .dividing-line {width: 1px; height: 16px; display: inline-
.severity-issue.severity-4, .c-severity .severity-3 {color: #313C52;}
.label-pri, .label-selector > .label {color: #9EA3B0; border-color: #9EA3B0;}
.label-pri-1, .label-selector > .label-pri[data-value="1"] {color: #FF4912; border-color: #FF4912;}
.label-pri-1, .label-selector > .label-pri[data-value="1"] {color: #FB2B2B; border-color: #FB2B2B;}
.label-pri-2, .label-selector > .label-pri[data-value="2"] {color: #F38F19; border-color: #F38F19;}
.label-pri-3, .label-selector > .label-pri[data-value="3"] {color: #37B2FE; border-color: #37B2FE;}
.label-pri-4, .label-pri-5, .label-selector > .label-pri[data-value="4"], .label-selector > .label-pri[data-value="5"] {color: #9EA3B0; border-color: #9EA3B0;}