From 85ae968b10b5a4909a8eaed381788d05a2964eec Mon Sep 17 00:00:00 2001
From: chenfei <chenfei@cnezsoft.com>
Date: Thu, 16 Jul 2020 16:28:21 +0800
Subject: [PATCH]  * Finish task #7478.

---
 module/bug/model.php | 54 ++++++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/module/bug/model.php b/module/bug/model.php
index ba4506029f..78207944e1 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -13,6 +13,8 @@
 <?php
 class bugModel extends model
 {
+    public $steps = array();
+
     /**
      * Set menu.
      *
@@ -1671,36 +1673,24 @@ class bugModel extends model
         {
             $i = 1;
             $bugStep = '';
-            foreach($steps as $stepId)
-            {
-                if(!isset($caseSteps[$stepId])) continue;
-
-                $step = $caseSteps[$stepId];
-                $bugStep .= $i . '. '  . $step->desc . "<br />";
-                $i++;
-            }
-            $bugSteps .= $bugStep ? str_replace('<br/>', '', $this->lang->bug->tplStep) . $bugStep : $this->lang->bug->tplStep;
-
-            $i = 1;
             $bugResult = '';
-            foreach($steps as $stepId)
-            {
-                if(!isset($stepResults[$stepId]) or empty($stepResults[$stepId]['real'])) continue;
-                $bugResult .= $i . '. ' . $stepResults[$stepId]['real'] . "<br />";
-                $i++;
-            }
-            $bugSteps .= $bugResult ? str_replace('<br/>', '', $this->lang->bug->tplResult) . $bugResult : $this->lang->bug->tplResult;
-
-            $i = 1;
             $bugExpect = '';
             foreach($steps as $stepId)
             {
                 if(!isset($caseSteps[$stepId])) continue;
-
                 $step = $caseSteps[$stepId];
-                if($step->expect) $bugExpect .= $i . '. ' . $step->expect . "<br />";
+
+                list($i, $order) = $this->buildStepOrder($step, $steps, $i);
+
+                $stepResult = (!isset($stepResults[$stepId]) or empty($stepResults[$stepId]['real'])) ? '' : $stepResults[$stepId]['real'];
+                $bugStep   .= $order . '. ' . $step->desc . "<br />";
+                $bugResult .= $order . '. ' . $stepResult . "<br />";
+                $bugExpect .= $order . '. ' . $step->expect . "<br />";
+
                 $i++;
             }
+            $bugSteps .= $bugStep ? str_replace('<br/>', '', $this->lang->bug->tplStep) . $bugStep : $this->lang->bug->tplStep;
+            $bugSteps .= $bugResult ? str_replace('<br/>', '', $this->lang->bug->tplResult) . $bugResult : $this->lang->bug->tplResult;
             $bugSteps .= $bugExpect ? str_replace('<br/>', '', $this->lang->bug->tplExpect) . $bugExpect : $this->lang->bug->tplExpect;
         }
         else
@@ -2862,4 +2852,24 @@ class bugModel extends model
 
         return sprintf($this->lang->bug->summary, count($bugs), $unresolved);
     }
+
+    /**
+     * Build step order.
+     *
+     * @param  object $step
+     * @param  array  $caseSteps
+     * @param  int    $i
+     * @access public
+     * @return array
+     */
+    public function buildStepOrder($step, $caseSteps, $i)
+    {
+        if($step->parent == 0 or !in_array($step->parent, $caseSteps)) return array($i, $i);
+
+        $i --;
+        $j = isset($this->steps[$step->parent]) ? (count($this->steps[$step->parent]) + 1) : 1;
+        $this->steps[$step->parent][] = $step->id;
+
+        return array($i, "$i.$j");
+    }
 }