diff --git a/module/testcase/control.php b/module/testcase/control.php
index 08bc1166b7..4dd92acf03 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -1279,26 +1279,30 @@ class testcase extends control
$modules = $this->loadModel('tree')->getOptionMenu($productID, 'case');
$rows = array();
- foreach($modules as $moduleID => $module)
+ $num = (int)$this->post->num;
+ for($i = 0; $i < $num; $i++)
{
- $row = new stdclass();
- $row->module = $module . "(#$moduleID)";
- $row->stepDesc = "1. \n2. \n3.";
- $row->stepExpect = "1. \n2. \n3.";
-
- if(empty($rows))
+ foreach($modules as $moduleID => $module)
{
- $row->typeValue = join("\n", $this->lang->testcase->typeList);
- $row->stageValue = join("\n", $this->lang->testcase->stageList);
- if($product->type != 'normal') $row->branchValue = join("\n", $branches);
+ $row = new stdclass();
+ $row->module = $module . "(#$moduleID)";
+ $row->stepDesc = "1. \n2. \n3.";
+ $row->stepExpect = "1. \n2. \n3.";
+
+ if(empty($rows))
+ {
+ $row->typeValue = join("\n", $this->lang->testcase->typeList);
+ $row->stageValue = join("\n", $this->lang->testcase->stageList);
+ if($product->type != 'normal') $row->branchValue = join("\n", $branches);
+ }
+ $rows[] = $row;
}
- $rows[] = $row;
}
$this->post->set('fields', $fields);
$this->post->set('kind', 'testcase');
$this->post->set('rows', $rows);
- $this->post->set('extraNum', $this->post->num);
+ $this->post->set('extraNum', $num);
$this->post->set('fileName', 'templet');
$this->fetch('file', 'export2csv', $_POST);
}
diff --git a/module/testreport/view/blockbugs.html.php b/module/testreport/view/blockbugs.html.php
index 1ad2a43510..61221c39e0 100644
--- a/module/testreport/view/blockbugs.html.php
+++ b/module/testreport/view/blockbugs.html.php
@@ -1,7 +1,7 @@
session->notHead ? common::getSysURL() : '';?>
-
+
| idAB;?> |
priAB;?> |
testreport->bugTitle;?> |
@@ -12,7 +12,7 @@
-
+
| id) . html::hidden('bugs[]', $bug->id)?> |
diff --git a/module/testreport/view/blockbuilds.html.php b/module/testreport/view/blockbuilds.html.php
index c3ed6fd38f..ebf1dfaa50 100644
--- a/module/testreport/view/blockbuilds.html.php
+++ b/module/testreport/view/blockbuilds.html.php
@@ -1,7 +1,7 @@
session->notHead ? common::getSysURL() : '';?>
-
+
| build->id;?> |
build->name;?> |
build->builder;?> |
@@ -9,7 +9,7 @@
-
+
| id) . html::hidden('builds[]', $build->id)?> |
diff --git a/module/testreport/view/blockcases.html.php b/module/testreport/view/blockcases.html.php
index 0a98eb74f1..b9e474f395 100644
--- a/module/testreport/view/blockcases.html.php
+++ b/module/testreport/view/blockcases.html.php
@@ -1,7 +1,7 @@
session->notHead ? common::getSysURL() : '';?>
-
+
| idAB;?> |
priAB;?> |
testcase->title;?> |
@@ -14,7 +14,7 @@
-
+
| id) . html::hidden('cases[]', $case->id)?> |
diff --git a/module/testreport/view/blocklegacybugs.html.php b/module/testreport/view/blocklegacybugs.html.php
index 6f87df49c2..54fba035a8 100644
--- a/module/testreport/view/blocklegacybugs.html.php
+++ b/module/testreport/view/blocklegacybugs.html.php
@@ -1,7 +1,7 @@
session->notHead ? common::getSysURL() : '';?>
-
+
| idAB;?> |
priAB;?> |
bug->title;?> |
@@ -12,7 +12,7 @@
-
+
| id);?> |
diff --git a/module/testreport/view/blockstories.html.php b/module/testreport/view/blockstories.html.php
index 7038901415..7ea1d07b68 100644
--- a/module/testreport/view/blockstories.html.php
+++ b/module/testreport/view/blockstories.html.php
@@ -1,7 +1,7 @@
session->notHead ? common::getSysURL() : '';?>
-
+
| idAB;?> |
priAB;?> |
testreport->storyTitle;?> |
@@ -13,7 +13,7 @@
-
+
| id) . html::hidden('stories[]', $story->id)?> |
diff --git a/module/testreport/view/create.html.php b/module/testreport/view/create.html.php
index 6525b2efcc..b0380427ba 100644
--- a/module/testreport/view/create.html.php
+++ b/module/testreport/view/create.html.php
@@ -47,14 +47,17 @@
| testreport->members?> |
|
+ |
| testreport->title?> |
|
+ |
| testreport->goal?> |
desc?> |
+ |
| testreport->profile?> |
@@ -66,17 +69,20 @@
unset($bugInfo['countBugByTask']); unset($bugInfo['bugConfirmedRate']); unset($bugInfo['bugCreateByCaseRate']); unset($bugInfo['foundBugs']);
?>
+ |
| testreport->report?> |
|
+ |
| files?> |
fetch('file', 'buildform');?> |
+ |
- |
+ |
|
diff --git a/module/testreport/view/edit.html.php b/module/testreport/view/edit.html.php
index e0b2710a30..fcbd21df29 100644
--- a/module/testreport/view/edit.html.php
+++ b/module/testreport/view/edit.html.php
@@ -47,14 +47,17 @@
| testreport->members?> |
members, "class='form-control chosen' multiple")?> |
+ |
| testreport->title?> |
title, "class='form-control'")?> |
+ |
| testreport->goal?> |
desc?> |
+ |
| testreport->profile?> |
@@ -66,17 +69,20 @@
unset($bugInfo['countBugByTask']); unset($bugInfo['bugConfirmedRate']); unset($bugInfo['bugCreateByCaseRate']); unset($bugInfo['foundBugs']);
?>
+ |
| testreport->report?> |
report, "class='form-control'")?> |
+ |
| files?> |
fetch('file', 'buildform');?> |
+ |
- |
+ |
|
diff --git a/module/testreport/view/view.html.php b/module/testreport/view/view.html.php
index c5977caca7..0374657d52 100644
--- a/module/testreport/view/view.html.php
+++ b/module/testreport/view/view.html.php
@@ -54,7 +54,7 @@
| testreport->owner?> |
- owner);?> |
+ owner);?> |
| testreport->members?> |
@@ -78,7 +78,7 @@
session->notHead):?>
| files?> |
- fetch('file', 'printFiles', array('files' => $report->files, 'fieldset' => 'false'));?> |
+ fetch('file', 'printFiles', array('files' => $report->files, 'fieldset' => 'false'));?> |
diff --git a/module/testsuite/control.php b/module/testsuite/control.php
index 3eb18861e1..f55ec7fc75 100644
--- a/module/testsuite/control.php
+++ b/module/testsuite/control.php
@@ -15,7 +15,7 @@ class testsuite extends control
/**
* Index page, header to browse.
- *
+ *
* @access public
* @return void
*/
@@ -25,13 +25,13 @@ class testsuite extends control
}
/**
- * Browse test suites.
- *
- * @param int $productID
- * @param string $orderBy
- * @param int $recTotal
- * @param int $recPerPage
- * @param int $pageID
+ * Browse test suites.
+ *
+ * @param int $productID
+ * @param string $orderBy
+ * @param int $recTotal
+ * @param int $recPerPage
+ * @param int $pageID
* @access public
* @return void
*/
@@ -69,8 +69,8 @@ class testsuite extends control
/**
* Create a test suite.
- *
- * @param int $productID
+ *
+ * @param int $productID
* @access public
* @return void
*/
@@ -109,12 +109,12 @@ class testsuite extends control
/**
* View a test suite.
- *
- * @param int $suiteID
- * @param string $orderBy
- * @param int $recTotal
- * @param int $recPerPage
- * @param int $pageID
+ *
+ * @param int $suiteID
+ * @param string $orderBy
+ * @param int $recTotal
+ * @param int $recPerPage
+ * @param int $pageID
* @access public
* @return void
*/
@@ -159,8 +159,8 @@ class testsuite extends control
/**
* Edit a test suite.
- *
- * @param int $suiteID
+ *
+ * @param int $suiteID
* @access public
* @return void
*/
@@ -226,8 +226,8 @@ class testsuite extends control
/**
* Delete a test suite.
- *
- * @param int $suiteID
+ *
+ * @param int $suiteID
* @param string $confirm yes|no
* @access public
* @return void
@@ -265,12 +265,12 @@ class testsuite extends control
/**
* Link cases to a test suite.
- *
- * @param int $suiteID
- * @param int $param
- * @param int $recTotal
- * @param int $recPerPage
- * @param int $pageID
+ *
+ * @param int $suiteID
+ * @param int $param
+ * @param int $recTotal
+ * @param int $recPerPage
+ * @param int $pageID
* @access public
* @return void
*/
@@ -333,10 +333,10 @@ class testsuite extends control
/**
* Remove a case from test suite.
- *
- * @param int $suiteID
- * @param int $rowID
- * @param string $confirm
+ *
+ * @param int $suiteID
+ * @param int $rowID
+ * @param string $confirm
* @access public
* @return void
*/
@@ -383,14 +383,14 @@ class testsuite extends control
/**
* Show library case.
- *
- * @param int $libID
- * @param string $browseType
- * @param int $param
- * @param string $orderBy
- * @param int $recTotal
- * @param int $recPerPage
- * @param int $pageID
+ *
+ * @param int $libID
+ * @param string $browseType
+ * @param int $param
+ * @param string $orderBy
+ * @param int $recTotal
+ * @param int $recPerPage
+ * @param int $pageID
* @access public
* @return void
*/
@@ -465,8 +465,8 @@ class testsuite extends control
}
/**
- * Create lib
- *
+ * Create lib
+ *
* @access public
* @return void
*/
@@ -503,9 +503,9 @@ class testsuite extends control
/**
* Create case for library.
- *
- * @param int $libID
- * @param int $moduleID
+ *
+ * @param int $libID
+ * @param int $moduleID
* @access public
* @return void
*/
@@ -590,9 +590,9 @@ class testsuite extends control
/**
* Batch create case.
- *
- * @param int $libID
- * @param int $moduleID
+ *
+ * @param int $libID
+ * @param int $moduleID
* @access public
* @return void
*/
@@ -632,8 +632,8 @@ class testsuite extends control
/**
* View library
- *
- * @param int $libID
+ *
+ * @param int $libID
* @access public
* @return void
*/
@@ -659,11 +659,11 @@ class testsuite extends control
/**
* Ajax get drop menu.
- *
- * @param int $libID
- * @param string $module
- * @param string $method
- * @param string $extra
+ *
+ * @param int $libID
+ * @param string $module
+ * @param string $method
+ * @param string $extra
* @access public
* @return void
*/
@@ -684,11 +684,11 @@ class testsuite extends control
/**
* The results page of search.
- *
- * @param string $keywords
- * @param string $module
- * @param string $method
- * @param mix $extra
+ *
+ * @param string $keywords
+ * @param string $module
+ * @param string $method
+ * @param mix $extra
* @access public
* @return void
*/
@@ -703,8 +703,8 @@ class testsuite extends control
/**
* Export templet.
- *
- * @param int $libID
+ *
+ * @param int $libID
* @access public
* @return void
*/
@@ -729,25 +729,29 @@ class testsuite extends control
$modules = $this->loadModel('tree')->getOptionMenu($libID, $viewType = 'caselib', $startModuleID = 0);
$rows = array();
- foreach($modules as $moduleID => $module)
+ $num = (int)$this->post->num;
+ for($i = 0; $i < $num; $i++)
{
- $row = new stdclass();
- $row->module = $module . "(#$moduleID)";
- $row->stepDesc = "1. \n2. \n3.";
- $row->stepExpect = "1. \n2. \n3.";
-
- if(empty($rows))
+ foreach($modules as $moduleID => $module)
{
- $row->typeValue = join("\n", $this->lang->testcase->typeList);
- $row->stageValue = join("\n", $this->lang->testcase->stageList);
+ $row = new stdclass();
+ $row->module = $module . "(#$moduleID)";
+ $row->stepDesc = "1. \n2. \n3.";
+ $row->stepExpect = "1. \n2. \n3.";
+
+ if(empty($rows))
+ {
+ $row->typeValue = join("\n", $this->lang->testcase->typeList);
+ $row->stageValue = join("\n", $this->lang->testcase->stageList);
+ }
+ $rows[] = $row;
}
- $rows[] = $row;
}
$this->post->set('fields', $fields);
$this->post->set('kind', 'testcase');
$this->post->set('rows', $rows);
- $this->post->set('extraNum', $this->post->num);
+ $this->post->set('extraNum', $num);
$this->post->set('fileName', 'templet');
$this->fetch('file', 'export2csv', $_POST);
}
@@ -757,8 +761,8 @@ class testsuite extends control
/**
* Import case csv file.
- *
- * @param int $libID
+ *
+ * @param int $libID
* @access public
* @return void
*/
@@ -824,8 +828,8 @@ class testsuite extends control
/**
* Show import case.
- *
- * @param int $libID
+ *
+ * @param int $libID
* @access public
* @return void
*/
@@ -890,7 +894,7 @@ class testsuite extends control
{
$id = trim(substr($cellValue, strrpos($cellValue,'(#') + 2), ')');
$case->$field = $id;
- }
+ }
}
elseif(in_array($field, $caseConfig->export->listFields))
{