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

* Finish task #6522.

Browse Source
This commit is contained in:
Yagami
2019-11-19 11:14:23 +08:00
parent a0ca607022
commit 3173f9a71f
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/control.php
+2 -2
View File
@@ -993,11 +993,11 @@ class testcase extends control
* @access public
* @return void
*/
public function confirmChange($caseID, $from = 'view')
public function confirmChange($caseID, $taskID = 0, $from = 'view')
{
$case = $this->testcase->getById($caseID);
$this->dao->update(TABLE_TESTRUN)->set('version')->eq($case->version)->where('`case`')->eq($caseID)->exec();
if($from == 'view') die(js::locate(inLink('view', "caseID=$caseID"), 'parent'));
if($from == 'view') die(js::locate(inlink('view', "caseID=$caseID&version=$case->version&from=testtask&taskID=$taskID"), 'parent'));
die(js::reload('parent'));
}
module/testcase/view/view.html.php
+1 -1
View File
@@ -223,7 +223,7 @@
if($case->version > $case->currentVersion and $from == 'testtask')
{
echo "(<span class='warning' title={$lang->testcase->fromTesttask}>{$lang->testcase->changed}</span> ";
if(common::hasPriv('testcase', 'confirmchange')) echo html::a($this->createLink('testcase', 'confirmchange', "caseID=$case->id"), $lang->testcase->sync, 'hiddenwin', "class='btn btn-mini btn-info'");
if(common::hasPriv('testcase', 'confirmchange')) echo html::a($this->createLink('testcase', 'confirmchange', "caseID=$case->id&taskID=$taskID"), $lang->testcase->sync, 'hiddenwin', "class='btn btn-mini btn-info'");
echo ")";
}
if(isset($case->fromCaseVersion) and $case->fromCaseVersion > $case->version and $from != 'testtask')
module/testtask/model.php
+1 -1
View File
@@ -1278,7 +1278,7 @@ class testtaskModel extends model
case 'actions':
if($caseChanged)
{
common::printIcon('testcase', 'confirmChange', "id=$run->case&from=list", $run, 'list', 'search', 'hiddenwin');
common::printIcon('testcase', 'confirmChange', "id=$run->case&taskID=$run->task&from=list", $run, 'list', 'search', 'hiddenwin');
break;
}