diff --git a/module/testcase/model.php b/module/testcase/model.php
index ef1330625b..4c4341c668 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -2103,6 +2103,62 @@ class testcaseModel extends model
$this->loadModel('search')->setSearchParams($this->config->testcase->search);
}
+ /**
+ * Print rows of cases.
+ *
+ * @param int $index
+ * @param array $cases
+ * @param array $setting
+ * @param array $users
+ * @param array $branchOption
+ * @param array $modulePairs
+ * @param string $browseType
+ * @param string $mode
+ * @access public
+ * @return int
+ */
+ public function printRow($index, $cases, $setting, $users, $branchOption, $modulePairs, $browseType, $mode)
+ {
+ foreach($cases as $case)
+ {
+ $case->index = $index;
+
+ $trClass = '';
+ $trAttrs = "data-id='{$case->id}' data-auto='" . zget($case, 'auto', '') . "' data-order='{$case->sort}' data-parent='{$case->parent}' data-product='{$case->product}'";
+ if($case->isCase == 2)
+ {
+ $trAttrs .= " data-nested='true'";
+ $trClass .= $case->parent == '0' ? ' is-top-level table-nest-child-hide' : ' table-nest-hide';
+ }
+
+ if($case->parent)
+ {
+ if($case->isCase != 2) $trClass .= ' is-nest-child';
+ $trClass .= ' table-nest-hide';
+ $trAttrs .= " data-nest-parent='{$case->parent}' data-nest-path='{$case->path}'";
+ }
+ elseif($case->isCase != 2)
+ {
+ $trClass .= ' no-nest';
+ }
+ $trAttrs .= " class='row-case $trClass'";
+
+ echo "
";
+ foreach($setting as $key => $value) $this->printCell($value, $case, $users, $branchOption, $modulePairs, $browseType, $mode, $case->isCase);
+ echo '
';
+
+ $index++;
+
+ if(!empty($case->children) || !empty($case->cases))
+ {
+ if(!empty($case->children)) $index = printRow($index, $case->children, $setting, $users, $branchOption, $modulePairs, $browseType, $mode);
+ if(!empty($case->cases)) $index = printRow($index, $case->cases, $setting, $users, $branchOption, $modulePairs, $browseType, $mode);
+ }
+ }
+
+ return $index;
+ }
+
/**
* Print cell data
*
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index edeb953d52..4eea4f3c1c 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -134,52 +134,7 @@ js::set('langNormal', $lang->testcase->normal);
- index = $index;
-
- $prefix = $case->isCase == 1 ? 'case_' : 'scene_';
- $trClass = '';
- $trAttrs = "data-id='{$prefix}{$case->id}' data-auto='" . zget($case, 'auto', '') . "' data-order='{$case->sort}' data-parent='{$case->parent}' data-product='{$case->product}'";
- if($case->isCase == 2)
- {
- $trAttrs .= " data-nested='true'";
- $trClass .= $case->parent == '0' ? ' is-top-level table-nest-child-hide' : ' table-nest-hide';
- }
-
- if($case->parent)
- {
- if($case->isCase != 2) $trClass .= ' is-nest-child';
- $trClass .= ' table-nest-hide';
- $trAttrs .= " data-nest-parent='{$case->parent}' data-nest-path='{$case->path}'";
- }
- elseif($case->isCase != 2)
- {
- $trClass .= ' no-nest';
- }
- $trAttrs .= " class='row-case $trClass'";
-
- echo "";
- foreach($setting as $key => $value) $testcase->printCell($value, $case, $users, $branchOption, $modulePairs, $browseType, $mode, $case->isCase);
- echo '
';
-
- $index++;
-
- if(!empty($case->children) || !empty($case->cases))
- {
- if(!empty($case->children)) $index = printRow($index, $testcase, $case->children, $setting, $users, $branchOption, $modulePairs, $browseType, $mode);
- if(!empty($case->cases)) $index = printRow($index, $testcase, $case->cases, $setting, $users, $branchOption, $modulePairs, $browseType, $mode);
- }
- }
-
- return $index;
- }
-
- printRow(1, $this->testcase, $cases, $setting, $users, $branchOption, $modulePairs, $browseType, $useDatatable ? 'datatable' : 'table');
- ?>
+ testcase->printRow(1, $cases, $setting, $users, $branchOption, $modulePairs, $browseType, $useDatatable ? 'datatable' : 'table');?>
';?>