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

Merge branch 'sgm_69027' into zentaopms_239

Browse Source
This commit is contained in:
sunguangming
2022-09-16 08:53:20 +08:00
parent 9d835d0ada ac994fc477
commit 3a7ed76456
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update17.6.1.sql
+1 -1
View File
@@ -1,4 +1,4 @@
ALTER TABLE `zt_product` ADD `shadow` tinyint(1) unsigned NOT NULL AFTER `code`;
ALTER TABLE `zt_project` ADD `hasProduct` tinyint(1) unsigned NOT NULL DEFAULT 1 AFTER `code`;
ALTER TABLE `zt_product` MODIFY `name` varchar(110) NOT NULL;
ALTER TABLE `zt_product` MODIFY `name` varchar(110) NOT NULL;
module/block/control.php
+1
View File
@@ -1503,6 +1503,7 @@ class block extends control
$count = zget($this->params, 'count', 10);
$status = isset($this->params->type) ? $this->params->type : 'wait';
$this->view->project = $this->loadModel('project')->getByID($this->session->project);
$this->view->testtasks = $this->dao->select('t1.*,t2.name as productName,t3.name as buildName,t4.name as projectName')
->from(TABLE_TESTTASK)->alias('t1')
->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
module/block/view/scrumtestblock.html.php
+2 -2
View File
@@ -18,7 +18,7 @@
<thead>
<tr class='text-center'>
<th class='text-left'><?php echo $lang->testtask->name;?></th>
<?php if($longBlock):?>
<?php if($longBlock and $project->hasProduct):?>
<th class='text-left'><?php echo $lang->testtask->product;?></th>
<?php endif;?>
<?php if($longBlock):?>
@@ -39,7 +39,7 @@
?>
<tr class='text-center' <?php echo $appid?>>
<td class='text-left text-ellipsis' title='<?php echo $testtask->name?>'><?php echo html::a($testtaskViewLink, $testtask->name);?></td>
<?php if($longBlock):?>
<?php if($longBlock and $project->hasProduct):?>
<td class='text-left text-ellipsis' title='<?php echo $testtask->productName?>'><?php echo html::a($productViewLink, $testtask->productName);?></td>
<?php endif;?>
<?php if($longBlock):?>
module/execution/control.php
+7 -2
View File
@@ -630,7 +630,10 @@ class execution extends control
$bugs = $this->execution->getSearchBugs($products, $executionID, $bugQuery, $pager, 'id_desc');
}
/* Build the search form. */
$execution = $this->execution->getByID($executionID);
$project = $this->loadModel('project')->getByID($execution->project);
/* Build the search form. */
$this->config->bug->search['actionURL'] = $this->createLink('execution', 'importBug', "executionID=$executionID&browseType=bySearch&param=myQueryID");
$this->config->bug->search['queryID'] = $queryID;
if(!empty($products))
@@ -674,6 +677,8 @@ class execution extends control
unset($this->config->bug->search['fields']['resolvedDate']);
unset($this->config->bug->search['fields']['closedDate']);
unset($this->config->bug->search['fields']['branch']);
if(!$project->hasProduct) unset($this->config->bug->search['fields']['product']);
unset($this->config->bug->search['params']['resolvedBy']);
unset($this->config->bug->search['params']['closedBy']);
unset($this->config->bug->search['params']['status']);
@@ -697,7 +702,7 @@ class execution extends control
$this->view->browseType = $browseType;
$this->view->param = $param;
$this->view->users = $users;
$this->view->execution = $this->execution->getByID($executionID);
$this->view->execution = $execution;
$this->view->executionID = $executionID;
$this->view->requiredFields = explode(',', $this->config->task->create->requiredFields);
$this->display();