From a5c19fd47921ddcc855cd36827d44fe1aa455e05 Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Wed, 15 Mar 2017 17:01:42 +0800
Subject: [PATCH]  * just use case step item as bug step when creating bug from
 case steps.

---
 module/testcase/view/createbug.html.php | 11 +++++++++++
 module/testcase/view/view.html.php      |  2 +-
 module/testtask/js/results.js           | 11 +++++++++++
 module/testtask/view/results.html.php   |  3 ++-
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/module/testcase/view/createbug.html.php b/module/testcase/view/createbug.html.php
index be64fed70c..dce1e2c1e6 100644
--- a/module/testcase/view/createbug.html.php
+++ b/module/testcase/view/createbug.html.php
@@ -29,6 +29,17 @@ $(function()
             $this.find('.collapse-handle').toggleClass('icon-chevron-down', !show).toggleClass('icon-chevron-up', show);;
         });
 
+        $(".step-group input[type='checkbox']").click(function()
+        {
+            var $next  = $(this).closest('tr').next();
+            while($next.length && $next.hasClass('step-item'))
+            {
+                var isChecked = $(this).prop('checked');
+                $next.find("input[type='checkbox']").prop('checked', isChecked);
+                $next = $next.next();
+            }
+        });
+
         $('#casesResults table caption .result-tip').html($('#resultTip').html());
 
         $('tr').remove('#result-success');
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index 8845b1b570..741d1c9e17 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -48,7 +48,7 @@
             common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$case->id&version=$case->currentVersion", '', 'button', '', '', 'runCase', false, "data-width='95%'");
             common::printIcon('testtask', 'results', "runID=$runID&caseID=$case->id&version=$case->version", '', 'button', '', '', 'results', false, "data-width='95%'");
 
-            if($caseFailCount > 0) common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$case->id,version=$case->version,runID=$runID", '', 'button', 'bug', '', 'iframe');
+            if($caseFailCount > 0) common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$case->id,version=$case->version,runID=$runID", '', 'button', 'bug', '', 'iframe', '', "data-width='90%'");
         }
         if($config->testcase->needReview) common::printIcon('testcase', 'review', "caseID=$case->id", $case, 'button', 'review', '', 'iframe');
         echo '</div>';
diff --git a/module/testtask/js/results.js b/module/testtask/js/results.js
index 18b41c6425..a02a644633 100644
--- a/module/testtask/js/results.js
+++ b/module/testtask/js/results.js
@@ -9,5 +9,16 @@ $(function()
         $this.find('.collapse-handle').toggleClass('icon-chevron-down', !show).toggleClass('icon-chevron-up', show);;
     });
 
+    $(".step-group input[type='checkbox']").click(function()
+    {
+        var $next  = $(this).closest('tr').next();
+        while($next.length && $next.hasClass('step-item'))
+        {
+            var isChecked = $(this).prop('checked');
+            $next.find("input[type='checkbox']").prop('checked', isChecked);
+            $next = $next.next();
+        }
+    });
+
     $('#casesResults table caption .result-tip').html($('#resultTip').html());
 });
diff --git a/module/testtask/view/results.html.php b/module/testtask/view/results.html.php
index 77e6cfa8ee..398bd6508a 100644
--- a/module/testtask/view/results.html.php
+++ b/module/testtask/view/results.html.php
@@ -82,7 +82,8 @@
               <tr class='step <?php echo $stepClass?>'>
                 <td class='step-id'>
                   <?php if($result->caseResult == 'fail'):?>
-                  <input type='checkbox' name='stepIDList[]'  value='<?php echo $key;?>'/>
+                  <?php $inputName = $stepClass == 'step-item' ? 'stepIDList[]' : 'stepGroup[]';?>
+                  <input type='checkbox' name='<?php echo $inputName;?>'  value='<?php echo $key;?>'/>
                   <?php endif;?>
                   <?php echo $stepId;?>
                 </td>