+ + + loadModel('project')->getPairs();?> + + @@ -185,3 +190,34 @@ + + diff --git a/module/testcase/js/view.js b/module/testcase/js/view.js index 320fef1aa8..ad13cad3f6 100644 --- a/module/testcase/js/view.js +++ b/module/testcase/js/view.js @@ -1,5 +1,5 @@ $(document).ready(function() { - if(config.onlybody != 'yes')$(".runCase").modalTrigger({width:900, type:'iframe', afterHide:function(){parent.location.href=parent.location.href;}}); - if(config.onlybody != 'yes')$(".results").modalTrigger({width:900, type:'iframe'}); + if(config.onlybody != 'yes')$(".runCase").modalTrigger({width:'90%', type:'iframe', afterHide:function(){parent.location.href=parent.location.href;}}); + if(config.onlybody != 'yes')$(".results").modalTrigger({width:'90%', type:'iframe'}); }) diff --git a/module/testcase/view/x.view.html.php b/module/testcase/view/x.view.html.php index 3d5849b775..e49863c39f 100644 --- a/module/testcase/view/x.view.html.php +++ b/module/testcase/view/x.view.html.php @@ -13,9 +13,12 @@ session->caseList != false ? $app->session->caseList : $this->createLink('testcase', 'browse', "productID=$case->product");?> - +
-
+
id;?> title;?> @@ -23,218 +26,62 @@ icons['testcase']) . " {$lang->testcase->fromCase}$lang->colon$case->fromCaseID";?>
-
-
task->project;?>id, "class='form-control chosen' onchange='loadAll(this.value)' required");?>
task->type;?> task->typeList, $task->type, "class='form-control chosen' onchange='setOwners(this.value)' required");?>
- - - - - - - - - - - - - - - - - - - - - - session->currentProductType != 'normal'):?> - - - - - - - - -
testcase->precondition;?>precondition);?>
testcase->steps;?> - - - - - - - - - steps as $stepID => $step) - { - $stepClass = "step-{$step->type}"; - if($step->type == 'group' or $step->type == 'step') - { - $stepId++; - $childId = 0; - } - if($step->type == 'step') $stepClass = 'step-group'; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - $childId ++; - } - ?> -
testcase->stepID;?>testcase->stepDesc;?>testcase->stepExpect;?>
$stepId
"; - if($step->type == 'item') echo "{$stepId}.{$childId}"; - echo nl2br(str_replace(' ', ' ', $step->desc)) . "
" . nl2br(str_replace(' ', ' ', $step->expect)) . "
- fetch('file', 'printFiles', array('files' => $case->files, 'fieldset' => 'true'));?> -
testcase->legendBasicInfo;?>
testcase->lib;?>
testcase->product;?>
product->branch;?>
testcase->module;?> + +
+
+
+
testcase->precondition;?>
+
precondition);?>
+
+
+
testcase->steps;?>
+
+ + + + + + + + steps as $stepID => $step) { - echo "/"; - } - else - { - foreach($modulePath as $key => $module) - { - echo $module->name; - if(isset($modulePath[$key + 1])) echo $lang->arrow; - } - } - ?> - - - global->flow != 'onlyTest'):?> - - - - - - - - - - - - "; + echo ""; + echo ""; + echo ""; + echo ""; + $childId ++; } ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - fromBug):?> - - - - - - - - - toBugs):?> - - - - - - - - - - - - - testcase->needReview or !empty($config->testcase->forceReview)):?> - - - - - - - - - - - - - -
testcase->stepID;?>testcase->stepDesc;?>testcase->stepExpect;?>
testcase->story;?> - storyTitle)) echo "#$case->story:$case->storyTitle"; - if($case->story and $case->storyStatus == 'active' and $case->latestStoryVersion > $case->storyVersion) - { - echo "({$lang->story->changed} "; - echo html::a($this->createLink('testcase', 'confirmStoryChange', "caseID=$case->id"), $lang->confirm, 'hiddenwin'); - echo ")"; - } - ?> -
testcase->type;?>testcase->typeList[$case->type];?>
testcase->stage;?> - stage) - { - $stags = explode(',', $case->stage); - foreach($stags as $stage) + $stepClass = "step-{$step->type}"; + if($step->type == 'group' or $step->type == 'step') { - if(empty($stage)) continue; - isset($lang->testcase->stageList[$stage]) ? print($lang->testcase->stageList[$stage]) : print($stage); - echo "
"; + $stepId++; + $childId = 0; } + if($step->type == 'step') $stepClass = 'step-group'; + echo "
$stepId
"; + if($step->type == 'item') echo "{$stepId}.{$childId}"; + echo nl2br(str_replace(' ', ' ', $step->desc)) . "
" . nl2br(str_replace(' ', ' ', $step->expect)) . "
testcase->pri;?>testcase->priList, $case->pri)?>
testcase->status;?> - testcase->statusList[$case->status]; - if($case->version > $case->currentVersion and $from == 'testtask') - { - echo "({$lang->testcase->changed} "; - echo html::a($this->createLink('testcase', 'confirmchange', "caseID=$case->id"), $lang->confirm, 'hiddenwin', "class='btn btn-mini btn-info'"); - echo ")"; - } - ?> -
app->loadLang('testtask')->testtask->lastRunTime;?>lastRunDate)) echo $case->lastRunDate;?>
app->loadLang('testtask')->testtask->lastRunResult;?>lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?>
testcase->keywords;?>keywords;?>
testcase->linkCase;?> - linkCaseTitles)) - { - foreach($case->linkCaseTitles as $linkCaseID => $linkCaseTitle) - { - echo html::a($this->createLink('testcase', 'view', "caseID=$linkCaseID", '', true), "#$linkCaseID $linkCaseTitle", '', "class='iframe' data-width='80%'") . '
'; - } - } - ?> -
testcase->legendLinkBugs;?>
testcase->fromBug;?>createLink('bug', 'view', "bugID=$case->fromBug", '', true), $case->fromBugTitle, '', "class='iframe' data-width='80%'");?>
testcase->toBug;?> - toBugs as $bugID => $bugTitle) - { - echo '

' . html::a($this->createLink('bug', 'view', "bugID=$bugID", '', true), $bugTitle, '', "class='iframe' data-width='80%'") . '

'; - } - ?> -
testcase->legendOpenAndEdit;?>
testcase->openedBy;?>openedBy] . $lang->at . $case->openedDate;?>
testcase->reviewedBy;?>reviewedBy); foreach($reviewedBy as $account) echo ' ' . $users[trim($account)]; ?>
testcase->reviewedDate;?>reviewedBy) echo $case->reviewedDate;?>
testcase->lblLastEdited;?>lastEditedBy) echo $users[$case->lastEditedBy] . $lang->at . $case->lastEditedDate;?>
+
+ fetch('file', 'printFiles', array('files' => $case->files, 'fieldset' => 'true'));?> +