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

* Finish task #8194.

Browse Source
This commit is contained in:
holan20180123
2020-11-10 10:34:08 +08:00
parent a10b52f3c6
commit 159cd5c41d
11 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
module/bug/control.php
View File

@@ -626,6 +626,7 @@ class bug extends control
$this->view->actions = $this->action->getList('bug', $bugID);
$this->view->builds = $this->loadModel('build')->getProductBuildPairs($productID, $branch = 0, $params = '');
$this->view->preAndNext = $this->loadModel('common')->getPreAndNextObject('bug', $bugID);
$this->view->product = $this->loadModel('product')->getByID( $productID);
$this->display();
}

2
module/bug/view/browse.html.php
View File

@@ -117,6 +117,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
?>
</ul>
</div>
<?php if(empty($this->config->global->closedProductStatus) or $product->status != 'closed'):?>
<?php if(!common::checkNotCN()):?>
<?php
common::printLink('bug', 'batchCreate', "productID=$productID&branch=$branch&projectID=0&moduleID=$moduleID", "<i class='icon icon-plus'></i>" . $lang->bug->batchCreate, '', "class='btn btn-secondary'");
@@ -162,6 +163,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
</ul>
</div>
<?php endif;?>
<?php endif;?>
</div>
</div>
<?php endif;?>

2
module/bug/view/view.html.php
View File

@@ -30,7 +30,9 @@
</div>
<?php if(!isonlybody()):?>
<div class="btn-toolbar pull-right">
<?php if(empty($this->config->global->closedProductStatus) or $product->status != 'closed'):?>
<?php common::printLink('bug', 'create', "productID={$bug->product}&branch={$bug->branch}&extra=moduleID={$bug->module}", "<i class='icon icon-plus'></i>" . $lang->bug->create, '', "class='btn btn-primary'"); ?>
<?php endif;?>
</div>
<?php endif;?>
</div>

2
module/testcase/view/caseheader.html.php
View File

@@ -102,6 +102,7 @@
?>
</ul>
</div>
<?php if(empty($this->config->global->closedProductStatus) or $product->status != 'closed'):?>
<div class='btn-group'>
<button type='button' class='btn btn-link dropdown-toggle' data-toggle='dropdown' id='importAction'><i class='icon icon-import muted'></i> <?php echo $lang->import ?><span class='caret'></span></button>
<ul class='dropdown-menu' id='importActionMenu'>
@@ -151,6 +152,7 @@
</ul>
</div>
<?php endif;?>
<?php endif;?>
</div>
</div>
<?php endif;?>

24
module/testreport/control.php
View File

@@ -57,6 +57,11 @@ class testreport extends control
if($extra) $task = $this->testtask->getById($extra);
$name = $extra ? $task->name : $object->name;
/* Determines whether an object is editable. */
$changeAllowed = true;
if($objectType == 'product' and !empty($this->config->global->closedProductStatus) and $object->status == 'closed') $changeAllowed = false;
if($objectType == 'project' and !empty($this->config->global->closedProjectStatus) and $object->status == 'closed') $changeAllowed = false;
/* Load pager. */
$this->app->loadClass('pager', $static = true);
if($this->app->getViewType() == 'mhtml') $recPerPage = 10;
@@ -100,15 +105,16 @@ class testreport extends control
$this->view->position[] = html::a(inlink('browse', "objectID=$objectID&objectType=$objectType&extra=$extra"), $extra ? $task->name : $object->name);
$this->view->position[] = $this->lang->testreport->browse;
$this->view->reports = $reports;
$this->view->orderBy = $orderBy;
$this->view->objectID = $objectID;
$this->view->objectType = $objectType;
$this->view->extra = $extra;
$this->view->pager = $pager;
$this->view->users = $this->user->getPairs('noletter|noclosed|nodeleted');
$this->view->tasks = $tasks;
$this->view->projects = $projects;
$this->view->reports = $reports;
$this->view->orderBy = $orderBy;
$this->view->objectID = $objectID;
$this->view->objectType = $objectType;
$this->view->extra = $extra;
$this->view->pager = $pager;
$this->view->users = $this->user->getPairs('noletter|noclosed|nodeleted');
$this->view->tasks = $tasks;
$this->view->projects = $projects;
$this->view->changeAllowed = $changeAllowed;
$this->display();
}

2
module/testreport/view/browse.html.php
View File

@@ -20,7 +20,7 @@
</span>
</div>
<div class='pull-right btn-toolbar'>
<?php if($objectType == 'product') common::printLink('testreport', 'create', "objectID=0&objectType=testtask&productID=$objectID", "<i class='icon icon-plus'></i>" . $lang->testreport->create, '', "class='btn btn-primary'");?>
<?php if($objectType == 'product' and $changeAllowed) common::printLink('testreport', 'create', "objectID=0&objectType=testtask&productID=$objectID", "<i class='icon icon-plus'></i>" . $lang->testreport->create, '', "class='btn btn-primary'");?>
</div>
</div>
<?php endif;?>

1
module/testsuite/control.php
View File

@@ -65,6 +65,7 @@ class testsuite extends control
$this->view->suites = $suites;
$this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter');
$this->view->pager = $pager;
$this->view->product = $this->product->getByID($productID);
$this->display();
}

4
module/testsuite/view/browse.html.php
View File

@@ -21,9 +21,11 @@
<span class='label label-light label-badge'><?php echo $pager->recTotal;?></span>
</a>
</div>
<?php if(empty($this->config->global->closedProductStatus) or $product->status != 'closed'):?>
<div class="btn-toolbar pull-right">
<?php common::printLink('testsuite', 'create', "product=$productID", "<i class='icon icon-plus'></i> " . $lang->testsuite->create, '', "class='btn btn-primary'");?>
</div>
<?php endif;?>
</div>
<?php endif;?>
<div id='mainContent' class='main-table' data-ride='table'>
@@ -31,7 +33,7 @@
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->testsuite->noTestsuite;?></span>
<?php if(common::hasPriv('testsuite', 'create')):?>
<?php if((empty($this->config->global->closedProductStatus) or $product->status != 'closed') and common::hasPriv('testsuite', 'create')):?>
<?php echo html::a($this->createLink('testsuite', 'create', "product=$productID"), "<i class='icon icon-plus'></i> " . $lang->testsuite->create, '', "class='btn btn-info'");?>
<?php endif;?>
</p>

2
module/testtask/control.php
View File

@@ -90,6 +90,7 @@ class testtask extends control
$this->view->branch = $branch;
$this->view->beginTime = $beginTime;
$this->view->endTime = $endTime;
$this->view->product = $this->product->getByID($productID);
$this->display();
}
@@ -136,6 +137,7 @@ class testtask extends control
$this->view->tasks = $this->testtask->getProductUnitTasks($productID, $browseType, $sort, $pager);
$this->view->users = $this->loadModel('user')->getPairs('noclosed|noletter');
$this->view->pager = $pager;
$this->view->product = $this->product->getByID($productID);
$this->display();
}

2
module/testtask/view/browse.html.php
View File

@@ -46,9 +46,11 @@ $status = $this->session->testTaskVersionStatus;
<div class='datepicker-wrapper datepicker-date'><?php echo html::input('date', $endTime, "class='form-control form-date' onchange='changeDate(\"$beginTime\", this.value, \"$condition\")'");?></div>
</div>
</div>
<?php if(empty($this->config->global->closedProductStatus) or $product->status != 'closed'):?>
<div class="btn-toolbar pull-right">
<?php common::printLink('testtask', 'create', "product=$productID", "<i class='icon icon-plus'></i> " . $lang->testtask->create, '', "class='btn btn-primary'");?>
</div>
<?php endif;?>
</div>
<?php endif;?>
<div id='mainContent' class='main-table'>

2
module/testtask/view/browseunits.html.php
View File

@@ -23,9 +23,11 @@
<?php echo html::a(inlink('browseUnits', "productID=$productID&browseType=$key&orderBy=$orderBy"), "<span class='text'>$label</span>", '', "id='{$key}Tab' class='btn btn-link'");?>
<?php endforeach;?>
</div>
<?php if(empty($this->config->global->closedProductStatus) or $product->status != 'closed'):?>
<div class="btn-toolbar pull-right">
<?php common::printLink('testtask', 'importUnitResult', "product=$productID", "<i class='icon icon-import'></i> " . $lang->testtask->importUnitResult, '', "class='btn btn-primary'");?>
</div>
<?php endif;?>
</div>
<div id='mainContent' class='main-table' data-ride='table'>
<?php if(empty($tasks)):?>