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

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

Browse Source
This commit is contained in:
Yagami
2022-11-22 14:27:57 +08:00
parent e4a80e800d 18d88bad03
commit b9eba9ce2e
22 changed files with 47 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/build/js/create.js
+2 -2
View File
@@ -16,9 +16,9 @@ $().ready(function()
});
});
$('input[name=type]').change(function()
$('input[name=isIntegrated]').change(function()
{
if($(this).val() == 'execution')
if($(this).val() == 'no')
{
$('#execution').closest('tr').show();
$('#buildBox').closest('tr').hide();
module/build/lang/de.php
+4 -4
View File
@@ -33,7 +33,7 @@ $lang->build->project = 'Project';
$lang->build->branch = 'Platform/Branch';
$lang->build->branchName = '%s';
$lang->build->execution = $lang->executionCommon;
$lang->build->type = 'Type';
$lang->build->integrated = 'Integrated';
$lang->build->builds = 'Linked Builds';
$lang->build->name = 'Name';
$lang->build->date = 'Datum';
@@ -75,6 +75,6 @@ $lang->backhome = 'zurück';
$lang->build->featureBar['browse']['all'] = 'Build List';
$lang->build->typeList = array();
$lang->build->typeList['execution'] = "{$lang->executionCommon}版本";
$lang->build->typeList['project'] = '项目版本';
$lang->build->isIntegrated = array();
$lang->build->isIntegrated['no'] = 'No';
$lang->build->isIntegrated['yes'] = 'Yes';
module/build/lang/en.php
+4 -4
View File
@@ -33,8 +33,8 @@ $lang->build->project = 'Project';
$lang->build->branch = 'Platform/Branch';
$lang->build->branchName = '%s';
$lang->build->execution = $lang->executionCommon;
$lang->build->integrated = 'Integrated';
$lang->build->builds = 'Linked Builds';
$lang->build->type = 'Type';
$lang->build->name = 'Name';
$lang->build->date = 'Date';
$lang->build->builder = 'Builder';
@@ -75,6 +75,6 @@ $lang->backhome = 'back';
$lang->build->featureBar['browse']['all'] = 'Build List';
$lang->build->typeList = array();
$lang->build->typeList['execution'] = "{$lang->executionCommon}版本";
$lang->build->typeList['project'] = '项目版本';
$lang->build->isIntegrated = array();
$lang->build->isIntegrated['no'] = 'No';
$lang->build->isIntegrated['yes'] = 'Yes';
module/build/lang/fr.php
+4 -4
View File
@@ -33,7 +33,7 @@ $lang->build->project = 'Project';
$lang->build->branch = 'Plateforme/Branche';
$lang->build->branchName = '%s';
$lang->build->execution = $lang->executionCommon;
$lang->build->type = 'Type';
$lang->build->integrated = 'Integrated';
$lang->build->builds = 'Linked Builds';
$lang->build->name = 'Nom';
$lang->build->date = 'Date';
@@ -75,6 +75,6 @@ $lang->backhome = 'Retour';
$lang->build->featureBar['browse']['all'] = 'Build List';
$lang->build->typeList = array();
$lang->build->typeList['execution'] = "{$lang->executionCommon}版本";
$lang->build->typeList['project'] = '项目版本';
$lang->build->isIntegrated = array();
$lang->build->isIntegrated['no'] = 'No';
$lang->build->isIntegrated['yes'] = 'Yes';
module/build/lang/zh-cn.php
+4 -4
View File
@@ -33,7 +33,7 @@ $lang->build->project = '所属项目';
$lang->build->branch = '平台/分支';
$lang->build->branchName = '所属%s';
$lang->build->execution = '所属' . $lang->executionCommon;
$lang->build->type = '版本类型';
$lang->build->integrated = '集成版本';
$lang->build->builds = '关联版本';
$lang->build->name = '名称编号';
$lang->build->date = '打包日期';
@@ -74,6 +74,6 @@ $lang->build->action->buildopened = '$date, 由 <strong>$actor</strong> 创建
$lang->backhome = '返回';
$lang->build->typeList = array();
$lang->build->typeList['execution'] = "{$lang->executionCommon}版本";
$lang->build->typeList['project'] = '项目版本';
$lang->build->isIntegrated = array();
$lang->build->isIntegrated['no'] = '否';
$lang->build->isIntegrated['yes'] = '是';
module/build/model.php
+2 -2
View File
@@ -350,10 +350,10 @@ class buildModel extends model
->add('createdDate', helper::now())
->stripTags($this->config->build->editor->create['id'], $this->config->allowedTags)
->join('builds', ',')
->remove('resolvedBy,allchecker,files,labels,type,uid')
->remove('resolvedBy,allchecker,files,labels,isIntegrated,uid')
->get();
if($this->post->type == 'project') $build->execution = 0;
if($this->post->isIntegrated == 'yes') $build->execution = 0;
$build = $this->loadModel('file')->processImgURL($build, $this->config->build->editor->create['id'], $this->post->uid);
$this->dao->insert(TABLE_BUILD)->data($build)
module/build/view/create.html.php
+2 -2
View File
@@ -20,8 +20,8 @@
<form class='load-indicator main-form form-ajax' id='dataform' method='post' enctype='multipart/form-data'>
<table class='table table-form'>
<tr class="<?php echo ($app->tab == 'project' and !empty($multipleProject)) ? '' : 'hidden';?>">
<th><?php echo $lang->build->type;?></th>
<td><?php echo html::radio('type', $lang->build->typeList, 'execution');?></td>
<th><?php echo $lang->build->integrated;?></th>
<td><?php echo html::radio('isIntegrated', $lang->build->isIntegrated, 'no');?></td>
</tr>
<tr class="<?php echo !empty($multipleProject) ? '' : 'hidden';?>">
<th><?php echo $lang->executionCommon;?></th>
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/projectbuild/lang/zh-cn.php
+11 -11
View File
@@ -11,14 +11,14 @@
*/
$lang->projectbuild->common = '项目版本';
$lang->projectbuild->browse = '版本列表';
$lang->projectbuild->create = "创建项目版本";
$lang->projectbuild->edit = "编辑项目版本";
$lang->projectbuild->delete = "删除版本";
$lang->projectbuild->view = "版本详情";
$lang->projectbuild->linkStory = "关联{$lang->SRCommon}";
$lang->projectbuild->linkBug = "关联Bug";
$lang->projectbuild->unlinkStory = "移除{$lang->SRCommon}";
$lang->projectbuild->unlinkBug = "移除Bug";
$lang->projectbuild->batchUnlink = '批量移除';
$lang->projectbuild->batchUnlinkStory = "批量移除{$lang->SRCommon}";
$lang->projectbuild->batchUnlinkBug = '批量移除Bug';
$lang->projectbuild->create = "创建集成版本";
$lang->projectbuild->edit = "编辑集成版本";
$lang->projectbuild->delete = "删除集成版本";
$lang->projectbuild->view = "集成版本详情";
$lang->projectbuild->linkStory = "集成版本关联{$lang->SRCommon}";
$lang->projectbuild->linkBug = "集成版本关联Bug";
$lang->projectbuild->unlinkStory = "集成版本移除{$lang->SRCommon}";
$lang->projectbuild->unlinkBug = "集成版本移除Bug";
$lang->projectbuild->batchUnlink = '集成版本批量移除';
$lang->projectbuild->batchUnlinkStory = "集成版本批量移除{$lang->SRCommon}";
$lang->projectbuild->batchUnlinkBug = '集成版本批量移除Bug';
module/projectrelease/lang/de.php
+1
View File
@@ -27,6 +27,7 @@ $lang->projectrelease->unlinkBug = 'Unlink Bug';
$lang->projectrelease->export = 'Export as HTML';
$lang->projectrelease->browseAction = "Release List";
$lang->projectrelease->notify = 'notify';
$lang->projectrelease->product = "Product";
$lang->projectrelease->featureBar['browse']['all'] = 'All';
$lang->projectrelease->featureBar['browse']['normal'] = 'Active';
module/projectrelease/lang/en.php
+1
View File
@@ -27,6 +27,7 @@ $lang->projectrelease->unlinkBug = 'Unlink Bug';
$lang->projectrelease->export = 'Export as HTML';
$lang->projectrelease->browseAction = "Release List";
$lang->projectrelease->notify = 'notify';
$lang->projectrelease->product = "Product";
$lang->projectrelease->featureBar['browse']['all'] = 'All';
$lang->projectrelease->featureBar['browse']['normal'] = 'Active';
module/projectrelease/lang/fr.php
+1
View File
@@ -27,6 +27,7 @@ $lang->projectrelease->unlinkBug = 'Unlink Bug';
$lang->projectrelease->export = 'Export HTML';
$lang->projectrelease->browseAction = "Release List";
$lang->projectrelease->notify = 'notify';
$lang->projectrelease->product = "Product";
$lang->projectrelease->featureBar['browse']['all'] = 'All';
$lang->projectrelease->featureBar['browse']['normal'] = 'Active';
module/projectrelease/lang/zh-cn.php
+1
View File
@@ -27,6 +27,7 @@ $lang->projectrelease->unlinkBug = '移除Bug';
$lang->projectrelease->export = '导出HTML';
$lang->projectrelease->browseAction = "发布列表";
$lang->projectrelease->notify = "通知";
$lang->projectrelease->product = "所属产品";
$lang->projectrelease->featureBar['browse']['all'] = '全部';
$lang->projectrelease->featureBar['browse']['normal'] = '正常';
module/projectrelease/view/browse.html.php
+2 -2
View File
@@ -50,9 +50,9 @@
<th class='c-id'><?php echo $lang->release->id;?></th>
<th><?php echo $lang->release->name;?></th>
<?php if($project->hasProduct):?>
<th class='c-product'><?php echo $lang->release->product;?></th>
<th class='c-product'><?php echo $lang->projectrelease->product;?></th>
<?php endif;?>
<th class='c-build'><?php echo $lang->release->build;?></th>
<th class='c-build'><?php echo $lang->release->includedBuild;?></th>
<th class='c-status text-center'><?php echo $lang->release->status;?></th>
<th class='c-date text-center'><?php echo $lang->release->date;?></th>
<?php
module/projectrelease/view/create.html.php
+1 -1
View File
@@ -50,7 +50,7 @@
</tr>
<?php endif;?>
<tr>
<th><?php echo $lang->release->build;?></th>
<th><?php echo $lang->release->includedBuild;?></th>
<td id='buildBox'><?php echo html::select('build[]', $builds, '', "class='form-control chosen' multiple data-placeholder='{$lang->build->placeholder->multipleSelect}'");?></td>
<td></td>
</tr>
module/projectrelease/view/view.html.php
+1 -1
View File
@@ -350,7 +350,7 @@
<td><?php echo $release->name;?></td>
</tr>
<tr>
<th><?php echo $lang->release->build;?></th>
<th><?php echo $lang->release->includedBuild;?></th>
<td>
<?php
$buildHtml = array();
module/release/view/create.html.php
+1 -1
View File
@@ -34,7 +34,7 @@
</td>
</tr>
<tr>
<th><?php echo $lang->release->build;?></th>
<th><?php echo $lang->release->includedBuild;?></th>
<td><?php echo html::select('build[]', $builds, '', "class='form-control chosen' multiple data-placeholder='{$lang->build->placeholder->multipleSelect}'");?></td>
<td></td>
</tr>
module/release/view/view.html.php
+1 -1
View File
@@ -350,7 +350,7 @@
<td><?php echo $release->name;?></td>
</tr>
<tr>
<th><?php echo $lang->release->build;?></th>
<th><?php echo $lang->release->includedBuild;?></th>
<td>
<?php
$buildHtml = array();
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;}