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

* Finish Task #5405

Browse Source
This commit is contained in:
yfl
2019-04-26 09:40:57 +08:00
parent 76c8a2d56b
commit fdc4d29d3c
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/control.php
+3 -3
View File
@@ -807,16 +807,16 @@ class testcase extends control
* @access public
* @return void
*/
public function delete($caseID, $confirm = 'no')
public function delete($caseID, $runID ,$confirm = 'no')
{
if($confirm == 'no')
{
die(js::confirm($this->lang->testcase->confirmDelete, inlink('delete', "caseID=$caseID&confirm=yes")));
die(js::confirm($this->lang->testcase->confirmDelete, inlink('delete', "caseID=$caseID&runID=$runID&confirm=yes")));
}
else
{
$this->testcase->delete(TABLE_CASE, $caseID);
$this->dao->delete()->from(TABLE_TESTRUN)->where('id')->eq($runID)->exec();
/* if ajax request, send result. */
if($this->server->ajax)
{
module/testcase/view/view.html.php
+1 -1
View File
@@ -117,7 +117,7 @@
common::printIcon('testcase', 'edit',"caseID=$case->id", $case);
if(!$isLibCase) common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase&param=$case->id", $case, 'button', 'copy');
if($isLibCase and common::hasPriv('testsuite', 'createCase')) echo html::a($this->createLink('testsuite', 'createCase', "libID=$case->lib&moduleID=$case->module&param=$case->id", $case), "<i class='icon-copy'></i>", '', "class='btn' title='{$lang->testcase->copy}'");
common::printIcon('testcase', 'delete', "caseID=$case->id", $case, 'button', 'trash', 'hiddenwin');
common::printIcon('testcase', 'delete', "caseID=$case->id&runID=$runID", $case, 'button', 'trash', 'hiddenwin');
?>
<?php endif;?>
</div>