diff --git a/module/execution/control.php b/module/execution/control.php index bb72b95d4d..0922bc2ca3 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -1026,6 +1026,7 @@ class execution extends control $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'testcase', false); $cases = $this->testcase->appendData($cases, 'case'); + $cases = $this->loadModel('story')->checkNeedConfirm($cases); $this->view->title = $this->lang->execution->testcase; $this->view->executionID = $executionID; diff --git a/module/execution/view/testcase.html.php b/module/execution/view/testcase.html.php index eaca8e00a3..56ef3d6e4e 100644 --- a/module/execution/view/testcase.html.php +++ b/module/execution/view/testcase.html.php @@ -32,7 +32,7 @@ testtask->lastRunTime);?> testtask->lastRunResult);?> statusAB);?> - actions;?> + actions;?> @@ -40,7 +40,6 @@ case : $case->id; $runID = $type == 'assigntome' ? $case->id : 0; - $canBeChanged = common::canBeChanged('testcase', $case); ?> @@ -55,18 +54,26 @@ lastRunner);?> lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?> lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?> - processStatus('testcase', $case);?> + + needconfirm) + { + echo "{$this->lang->story->changed}"; + } + elseif(isset($case->fromCaseVersion) and $case->fromCaseVersion > $case->version and !$case->needconfirm) + { + echo "{$this->lang->testcase->changed}"; + } + else + { + echo "" . $this->processStatus('testcase', $case) . ""; + } + ?> + status == 'wait' ? 'disabled' : ''; - common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$caseID,version=$case->version,runID=$runID,executionID=$executionID", $case, 'list', 'bug', '', 'iframe', '', "data-width='90%'", '', $case->project); - common::printIcon('testcase', 'create', "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase¶m=$caseID", $case, 'list', 'copy', '', '', '', '', '', $case->project); - common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$caseID&version=$case->version", '', 'list', 'play', '', "iframe $disabled", true, "data-width='95%'", '', $case->project); - common::printIcon('testtask', 'results', "runID=$runID&caseID=$caseID", '', 'list', 'list-alt', '', 'iframe', true, "data-width='95%'", '', $case->project); - common::printIcon('testcase', 'edit', "caseID=$caseID&comment=false&executionID=$executionID", $case, 'list', 'edit', '', '', '', '', '', $case->project); - } + $case->browseType = $type; + echo $this->testcase->buildOperateMenu($case, 'browse'); ?>