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

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

Browse Source
This commit is contained in:
wangyidong
2021-07-26 17:41:57 +08:00
parent 84f4723fb6 12fb7839b7
commit c3a28b5c5b
8 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+4 -4
View File
@@ -442,7 +442,7 @@ class executionModel extends model
$oldExecution = $this->dao->findById($executionID)->from(TABLE_EXECUTION)->fetch();
/* Judgment of required items. */
if($this->post->code == '')
if($oldExecution->type != 'stage' and $this->post->code == '')
{
dao::$errors['code'] = sprintf($this->lang->error->notempty, $this->lang->execution->code);
return false;
@@ -502,7 +502,7 @@ class executionModel extends model
->checkIF($execution->begin != '', 'begin', 'date')
->checkIF($execution->end != '', 'end', 'date')
->checkIF($execution->end != '', 'end', 'gt', $execution->begin)
->check('code', 'unique', "id!=$executionID and deleted='0'")
->check('code', 'unique', "id!=$executionID and code!='' and deleted='0'")
->where('id')->eq($executionID)
->limit(1)
->exec();
@@ -609,11 +609,11 @@ class executionModel extends model
$nameList[$executionName] = $executionName;
/* Check unique code for edited executions. */
if(empty($executionCode))
if($projectModel == 'scrum' and empty($executionCode))
{
dao::$errors['code'][] = 'execution#' . $executionID . sprintf($this->lang->error->notempty, $this->lang->project->code);
}
else
elseif(!empty($executionCode))
{
/* Check unique code for edited executions. */
if(isset($codeList[$executionCode])) dao::$errors['code'][] = 'execution#' . $executionID . sprintf($this->lang->error->unique, $this->lang->project->code, $executionCode);
module/product/lang/de.php
+1 -1
View File
@@ -26,7 +26,7 @@ $lang->product->other = 'Andere';
$lang->product->closed = 'Geschlossen';
$lang->product->updateOrder = 'Ranking';
$lang->product->orderAction = "Rank {$lang->productCommon}";
$lang->product->all = "Alle {$lang->productCommon}";
$lang->product->all = "{$lang->productCommon} List";
$lang->product->manageLine = "Manage {$lang->productCommon} Line";
$lang->product->newLine = "Create {$lang->productCommon} Line";
$lang->product->export = 'Exportiere Daten';
module/product/lang/en.php
+1 -1
View File
@@ -24,7 +24,7 @@ $lang->product->mine = 'Mine';
$lang->product->other = 'Others';
$lang->product->closed = 'Closed';
$lang->product->updateOrder = 'Order';
$lang->product->all = "All {$lang->productCommon}s";
$lang->product->all = "{$lang->productCommon} List";
$lang->product->manageLine = "Manage {$lang->productCommon} Line";
$lang->product->newLine = "Create {$lang->productCommon} Line";
$lang->product->export = 'Export';
module/product/lang/fr.php
+1 -1
View File
@@ -26,7 +26,7 @@ $lang->product->other = 'Autres';
$lang->product->closed = 'Fermés';
$lang->product->updateOrder = 'Ordre';
$lang->product->orderAction = "Rang {$lang->productCommon}";
$lang->product->all = "Tous les {$lang->productCommon}s";
$lang->product->all = "{$lang->productCommon} List";
$lang->product->manageLine = "Manage {$lang->productCommon} Line";
$lang->product->newLine = "Create {$lang->productCommon} Line";
$lang->product->export = 'Export';
module/product/lang/vi.php
+1 -1
View File
@@ -26,7 +26,7 @@ $lang->product->other = 'Khác';
$lang->product->closed = 'Đã đóng';
$lang->product->updateOrder = 'Sắp xếp';
$lang->product->orderAction = "Đánh giá {$lang->productCommon}";
$lang->product->all = "Tất cả {$lang->productCommon}";
$lang->product->all = "{$lang->productCommon} List";
$lang->product->manageLine = "Manage {$lang->productCommon} Line";
$lang->product->newLine = "Create {$lang->productCommon} Line";
$lang->product->export = 'Xuất';
module/product/lang/zh-cn.php
+1 -1
View File
@@ -24,7 +24,7 @@ $lang->product->mine = '我负责';
$lang->product->other = '其他';
$lang->product->closed = '已关闭';
$lang->product->updateOrder = '排序';
$lang->product->all = "所有{$lang->productCommon}";
$lang->product->all = "{$lang->productCommon}列表";
$lang->product->manageLine = "维护{$lang->productCommon}线";
$lang->product->newLine = "新建{$lang->productCommon}线";
$lang->product->export = '导出数据';
module/testcase/control.php
+1 -2
View File
@@ -642,11 +642,10 @@ class testcase extends control
if($this->app->openApp == 'qa') $this->testcase->setMenu($this->products, $productID, $case->branch);
$this->view->title = "CASE #$case->id $case->title - " . $this->products[$productID];
$this->view->position[] = html::a($this->createLink('testcase', 'browse', "productID=$productID"), $this->products[$productID]);
$this->view->product = $product;
$this->view->branches = $branches;
$this->view->productName = $this->products[$productID];
$this->view->productName = isset($this->products[$productID]) ? $this->products[$productID] : '';
$this->view->branchName = $product->type == 'normal' ? '' : zget($branches, $case->branch, '');
}
module/testcase/view/view.html.php
+1 -1
View File
@@ -151,7 +151,7 @@
<?php else:?>
<tr>
<th class='thWidth'><?php echo $lang->testcase->product;?></th>
<td><?php echo common::hasPriv('product', 'browse') ? html::a($this->createLink('product', 'browse', "productID=$case->product"), $productName) : $productName;?></td>
<td><?php echo (common::hasPriv('product', 'browse') and $productName) ? html::a($this->createLink('product', 'browse', "productID=$case->product"), $productName) : $productName;?></td>
</tr>
<?php if($product->type != 'normal'):?>
<tr>