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

* finish task #1942.

Browse Source
This commit is contained in:
wangyidong
2014-07-18 08:16:56 +00:00
parent 9d29148250
commit 60925388fd
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update6.0.sql
+1
View File
@@ -3,3 +3,4 @@ ALTER TABLE `zt_story` CHANGE `stage` `stage` enum('','wait','planned','projecte
ALTER TABLE `zt_testtask` CHANGE `status` `status` enum('blocked','doing','wait','done') COLLATE 'utf8_general_ci' NOT NULL DEFAULT 'wait' AFTER `report`; ALTER TABLE `zt_testtask` CHANGE `status` `status` enum('blocked','doing','wait','done') COLLATE 'utf8_general_ci' NOT NULL DEFAULT 'wait' AFTER `report`;
ALTER TABLE `zt_todo` CHANGE `status` `status` enum('wait','doing','done') COLLATE 'utf8_general_ci' NOT NULL DEFAULT 'wait' AFTER `desc`; ALTER TABLE `zt_todo` CHANGE `status` `status` enum('wait','doing','done') COLLATE 'utf8_general_ci' NOT NULL DEFAULT 'wait' AFTER `desc`;
ALTER TABLE `zt_team` CHANGE `hours` `hours` float(2,1) unsigned NOT NULL DEFAULT '0' AFTER `days`; ALTER TABLE `zt_team` CHANGE `hours` `hours` float(2,1) unsigned NOT NULL DEFAULT '0' AFTER `days`;
ALTER TABLE `zt_bug` ADD `testtask` mediumint(8) unsigned NOT NULL AFTER `result`;
module/bug/control.php
+5
View File
@@ -252,6 +252,8 @@ class bug extends control
$buildID = 0; $buildID = 0;
$caseID = 0; $caseID = 0;
$runID = 0; $runID = 0;
$testtask = 0;
$version = 0;
$title = ''; $title = '';
$steps = $this->lang->bug->tplStep . $this->lang->bug->tplResult . $this->lang->bug->tplExpect; $steps = $this->lang->bug->tplStep . $this->lang->bug->tplResult . $this->lang->bug->tplExpect;
$os = ''; $os = '';
@@ -321,6 +323,9 @@ class bug extends control
$this->view->storyID = $storyID; $this->view->storyID = $storyID;
$this->view->buildID = $buildID; $this->view->buildID = $buildID;
$this->view->caseID = $caseID; $this->view->caseID = $caseID;
$this->view->runID = $runID;
$this->view->version = $version;
$this->view->testtask = $testtask;
$this->view->bugTitle = $title; $this->view->bugTitle = $title;
$this->view->steps = htmlspecialchars($steps); $this->view->steps = htmlspecialchars($steps);
$this->view->os = $os; $this->view->os = $os;
module/bug/view/create.html.php
+5 -1
View File
@@ -131,7 +131,11 @@ js::set('refresh', $lang->refresh);
<tr> <tr>
<td></td> <td></td>
<td colspan='2'> <td colspan='2'>
<?php echo html::submitButton() . html::backButton() . html::hidden('case', $caseID);?> <?php
echo html::submitButton() . html::backButton();
echo html::hidden('case', $caseID) . html::hidden('caseVersion', $version);
echo html::hidden('result', $runID) . html::hidden('testtask', $testtask);
?>
</td> </td>
</tr> </tr>
</table> </table>
module/testtask/view/cases.html.php
+1 -1
View File
@@ -103,7 +103,7 @@ var moduleID = '<?php echo $moduleID;?>';
echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"caseList\",confirmUnlink)", '<i class="icon-unlink"></i>', '', "title='{$lang->testtask->unlinkCase}' class='btn-icon'"); echo html::a("javascript:ajaxDelete(\"$unlinkURL\",\"caseList\",confirmUnlink)", '<i class="icon-unlink"></i>', '', "title='{$lang->testtask->unlinkCase}' class='btn-icon'");
} }
common::printIcon('testcase', 'createBug', "product=$productID&extra=projectID=$task->project,buildID=$task->build,caseID=$run->case,runID=$run->id", $run, 'list', 'bug'); common::printIcon('testcase', 'createBug', "product=$productID&extra=projectID=$task->project,buildID=$task->build,caseID=$run->case,version=$run->version,runID=$run->id,testtask=$taskID", $run, 'list', 'bug');
?> ?>
</td> </td>
</tr> </tr>