From dcead9593f1fa928eca2e770272d83e0dec1619e Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Thu, 28 Apr 2016 09:13:28 +0800
Subject: [PATCH] * adjust code for task #2577.

---
 module/file/view/buildform.html.php   |  2 ++
 module/testtask/js/runcase.js         | 22 ++++++++++++++++++++--
 module/testtask/view/results.html.php | 13 ++++++-------
 module/testtask/view/runcase.html.php |  2 +-
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/module/file/view/buildform.html.php b/module/file/view/buildform.html.php
index e15e60f892..a41a2abaf6 100644
--- a/module/file/view/buildform.html.php
+++ b/module/file/view/buildform.html.php
@@ -101,9 +101,11 @@ function addFile(clickedButton)
     fileRow = <?php echo json_encode($fileRow);?>;
     fileRow = fileRow.replace('$i', $('.fileID').size() + 1);
 
+    /* Get files and labels name.*/
     filesName  = $(clickedButton).closest('tr').find('input[type="file"]').attr('name');
     labelsName = $(clickedButton).closest('tr').find('input[type="text"]').attr('name');
 
+    /* Add file input control and set files and labels name in it.*/
     $fileBox = $(clickedButton).closest('.fileBox').after(fileRow).next('.fileBox');
     $fileBox.find('input[type="file"]').attr('name', filesName);
     $fileBox.find('input[type="text"]').attr('name', labelsName);
diff --git a/module/testtask/js/runcase.js b/module/testtask/js/runcase.js
index 005a6c3bee..3de3e6cb8e 100644
--- a/module/testtask/js/runcase.js
+++ b/module/testtask/js/runcase.js
@@ -1,12 +1,30 @@
 $(document).on('keyup', 'form textarea', function()
 {
-    var preSelect = $(this).parent().prev().find('select');
+    var preSelect = $(this).closest('table').parent().prev().find('select');
     if($(this).val() == '' && $(preSelect).val() == 'fail')
     {
         $(preSelect).val('pass');
     }
     else if($(this).val() != '' && $(preSelect).val() == 'pass')
     {
-        $(preSelect).val('fail');
+        $(preSelect).val('fail').parent().addClass('has-error');
+        setTimeout(function(){$(preSelect).parent().removeClass('has-error');},'1000');
     }
 })
+
+/* Delete a file. */
+function deleteFile(fileID)
+{
+    if(!fileID) return;
+    hiddenwin.location.href =createLink('file', 'delete', 'fileID=' + fileID);
+}
+
+/* Download a file, append the mouse to the link. Thus we call decide to open the file in browser no download it. */
+function downloadFile(fileID)
+{
+    if(!fileID) return;
+    var sessionString = '<?php echo $sessionString;?>';
+    var url = createLink('file', 'download', 'fileID=' + fileID + '&mouse=left') + sessionString;
+    window.open(url, '_blank');
+    return false;
+}
diff --git a/module/testtask/view/results.html.php b/module/testtask/view/results.html.php
index 763110de99..347ec8bdf0 100644
--- a/module/testtask/view/results.html.php
+++ b/module/testtask/view/results.html.php
@@ -43,7 +43,7 @@
           <td><?php echo $users[$result->lastRunner] . ' ' . $lang->testtask->runCase;?></td>
           <td class='w-150px'><?php echo zget($builds, $result->build, '');?></td>
           <td class='w-50px text-right'><strong class='text-<?php echo $class;?>'><?php echo $lang->testcase->resultList[$result->caseResult]?></strong></td>
-          <td class='w-20px'><?php if(!empty($result->files)) echo html::a("#caseResult{$result->id}", '<i class="btn-icon icon-file"></i>', '', "data-toggle='modal' title='{$lang->files}' data-type='iframe'")?></td>
+          <td class='w-40px'><?php if(!empty($result->files)) echo html::a("#caseResult{$result->id}", $lang->files, '', "data-toggle='modal' data-type='iframe'")?></td>
           <td class='w-50px text-center'><i class='collapse-handle icon-chevron-down text-muted'></i></td>
         </tr>
         <tr class='result-detail hide'>
@@ -53,9 +53,10 @@
                 <tr>
                   <th class='w-40px'><?php echo $lang->testcase->stepID;?></th>
                   <th class='w-p30'><?php echo $lang->testcase->stepDesc;?></th>
-                  <th class='w-p30'><?php echo $lang->testcase->stepExpect;?></th>
-                  <th><?php echo $lang->testcase->result;?></th>
+                  <th class='w-p25'><?php echo $lang->testcase->stepExpect;?></th>
+                  <th class='text-center'><?php echo $lang->testcase->result;?></th>
                   <th class='w-p20'><?php echo $lang->testcase->real;?></th>
+                  <th class='w-50px'></th>
                 </tr>
               </thead>
               <?php 
@@ -69,10 +70,8 @@
                 <td><?php if(isset($stepResult['expect'])) echo nl2br($stepResult['expect']);?></td>
                 <?php if(!empty($stepResult['result'])):?>
                 <td class='<?php echo $stepResult['result'];?> text-center'><?php echo $lang->testcase->resultList[$stepResult['result']];?></td>
-                <td>
-                  <?php echo $stepResult['real'];?>
-                  <?php if(!empty($stepResult['files'])) echo html::a("#stepResult{$modalID}", '<i class="btn-icon icon-file"></i>', '', "data-toggle='modal' title='{$lang->files}' data-type='iframe' style='float:right'")?>
-                </td>
+                <td><?php echo $stepResult['real'];?></td>
+                <td class='text-center'><?php if(!empty($stepResult['files'])) echo html::a("#stepResult{$modalID}", $lang->files, '', "data-toggle='modal' data-type='iframe'")?></td>
               </tr>
                 <?php else:?>
                 <td></td>
diff --git a/module/testtask/view/runcase.html.php b/module/testtask/view/runcase.html.php
index 5713f4b8be..99b9931cbf 100644
--- a/module/testtask/view/runcase.html.php
+++ b/module/testtask/view/runcase.html.php
@@ -33,7 +33,7 @@
           <th>
             <?php echo $lang->testcase->real;?>
             <?php if(empty($run->case->steps)):?>
-            <button type='button' class='btn btn-file' data-toggle='modal' data-target='#fileModal'><?php echo $lang->testtask->files;?></button>
+            <button type='button' class='btn btn-danger btn-file' data-toggle='modal' data-target='#fileModal'><?php echo $lang->testtask->files;?></button>
             <?php endif;?>
           </th>
         </tr>