* adjust for refreshPage and set closed for member.

module/task/control.php

@@ -367,7 +367,8 @@ class task extends control
         if(isset($tasks[$taskID])) unset($tasks[$taskID]);
 
         if(!isset($this->view->members[$this->view->task->assignedTo])) $this->view->members[$this->view->task->assignedTo] = $this->view->task->assignedTo;
-        if($this->view->task->status == 'closed' && !isset($this->view->members['closed'])) $this->view->members += array('closed' => 'closed');
+        if(isset($this->view->members['closed']) or $this->view->task->status == 'closed') $this->view->members['closed']  = 'Closed';
+
         $this->view->title         = $this->lang->task->edit . 'TASK' . $this->lang->colon . $this->view->task->name;
         $this->view->position[]    = $this->lang->task->common;
         $this->view->position[]    = $this->lang->task->edit;
@@ -522,6 +523,9 @@ class task extends control
             $members = $this->task->getMemberPairs($task);
         }
 
+        if(!isset($members[$task->assignedTo])) $members[$task->assignedTo] = $task->assignedTo;
+        if(isset($members['closed']) or $task->status == 'closed') $members['closed'] = 'Closed';
+
         $this->view->title      = $this->view->project->name . $this->lang->colon . $this->lang->task->assign;
         $this->view->position[] = $this->lang->task->assign;
         $this->view->task       = $task;

module/testcase/view/batchedit.html.php

@@ -89,12 +89,12 @@
               <?php
               if(!$forceNotReview and $cases[$caseID]->status == 'wait')
               {
-                echo $lang->testcase->statusList['wait'];
-                echo html::hidden("statuses[$caseID]",'wait');
+                  echo $lang->testcase->statusList['wait'];
+                  echo html::hidden("statuses[$caseID]", 'wait');
               }
               else
               {
-                echo html::select("statuses[$caseID]", (array)$lang->testcase->statusList, $cases[$caseID]->status, 'class=form-control');
+                  echo html::select("statuses[$caseID]", (array)$lang->testcase->statusList, $cases[$caseID]->status, 'class=form-control');
               }
               ?>
             </td>

module/testreport/js/common.js

@@ -11,7 +11,47 @@ $(function()
     resizeChartTable();
 });
 
+/**
+ * Change date then show refresh btn.
+ * 
+ * @access public
+ * @return void
+ */
 function changeDate()
 {
-    $("#refresh").removeAttr("style");
+    $("#refresh").removeClass("hidden");
+}
+
+/**
+ * Refresh page.
+ * 
+ * @access public
+ * @return void
+ */
+function refreshPage()
+{
+    var begin = $("#begin").val();
+    var end   = $("#end").val();
+
+    if(begin.indexOf('-') != -1)
+    {
+        var beginarray = begin.split("-");
+        var begin = '';
+        for(i = 0; i < beginarray.length; i++) begin = begin + beginarray[i];
+    }
+    if(end.indexOf('-') != -1)
+    {
+        var endarray = end.split("-");
+        var end = '';
+        for(i = 0 ; i < endarray.length ; i++) end = end + endarray[i];
+    }
+
+    if(method == 'create')
+    {
+        location.href = createLink('testreport', 'create', "project=" + objectID + "&objectType=" + objectType + "&extra=" + extra + "&begin=" + begin + "&end=" + end);
+    }
+    else if(method == 'edit')
+    {
+        location.href = createLink('testreport', 'edit', "reportID=" + reportID + "&from=" + from + "&begin=" + begin + "&end=" + end);
+    }
 }

module/testreport/view/create.html.php

@@ -40,9 +40,10 @@
                   <?php echo html::input('begin', $begin, "class='form-control form-date' onchange=changeDate()")?>
                   <span class='input-group-addon'> ~ </span>
                   <?php echo html::input('end', $end, "class='form-control form-date' onchange=changeDate()")?>
-                  <?php echo "<div class='input-group-btn' id='refresh' style='display: none'>"?>
-                  <a onclick=refreshPage() class='btn btn-icon' data-toggle='modal' data-type='iframe'><?php echo $lang->refresh?></a>
-                  <?php echo "</div>";
+                  <div class='input-group-btn hidden' id='refresh'>
+                    <a onclick=refreshPage() class='btn' data-toggle='modal' data-type='iframe'><?php echo $lang->refresh?></a>
+                  </div>
+                  <?php
                   echo html::hidden('product', $productIdList) . ($config->global->flow != 'onlyTest' ? html::hidden('project', isset($project->id) ? $project->id : 0) : '') . html::hidden('tasks', $tasks);
                   echo html::hidden('objectID', $objectID) . html::hidden('objectType', $objectType);
                   ?>
@@ -139,26 +140,9 @@
   </div>
 </div>
 <script>
-    function refreshPage()
-    {
-        var begin      = $("#begin").val();
-        var end        = $("#end").val();
-        var objectID   = $("#objectID").val();
-        var objectType = $("#objectType").val();
-        var extra      = <?php echo $extra;?>;
-        if(begin.indexOf('-') != -1)
-        {
-            var beginarray = begin.split("-");
-            var begin = '';
-            for(i = 0; i < beginarray.length; i++) begin = begin + beginarray[i];
-        }
-        if(end.indexOf('-') != -1)
-        {
-            var endarray = end.split("-");
-            var end = '';
-            for(i = 0 ; i < endarray.length ; i++) end = end + endarray[i];
-        }
-        location.href = createLink('testreport', 'create', "project=" + objectID + "&objectType=" + objectType + "&extra=" + extra + "&begin=" + begin + "&end=" + end);
-    }
+objectID   = $("#objectID").val();
+objectType = $("#objectType").val();
+extra      = '<?php echo $extra;?>';
+method     = 'create';
 </script>
 <?php include '../../common/view/footer.html.php';?>

module/testreport/view/edit.html.php

@@ -31,9 +31,9 @@
                 <?php echo html::input('begin', $begin, "class='form-control form-date' onchange=changeDate()")?>
                 <span class='input-group-addon'> ~ </span>
                 <?php echo html::input('end', $end, "class='form-control form-date' onchange=changeDate()")?>
-                <?php echo "<div class='input-group-btn' id='refresh' style='display: none'>"?>
-                     <a onclick=refreshPage() class='btn btn-icon' data-toggle='modal' data-type='iframe'><?php echo $lang->refresh?></a>
-                <?php echo "</div>"?>
+                <div class='input-group-btn hidden' id='refresh'>
+                  <a onclick=refreshPage() class='btn' data-toggle='modal' data-type='iframe'><?php echo $lang->refresh?></a>
+                </div>
                 <?php echo html::hidden('product', $productIdList) . ($config->global->flow != 'onlyTest' ? html::hidden('project', $project->id) : '') . html::hidden('tasks', $tasks);?>
               </div>
             </td>
@@ -117,25 +117,8 @@
   </div>
 </div>
 <script>
-    function refreshPage()
-    {
-        var begin    = $("#begin").val();
-        var end      = $("#end").val();
-        var reportID = <?php echo $report->id;?>;
-        var from     = <?php echo "'" . $from . "'";?>;
-        if(begin.indexOf('-') != -1)
-        {
-            var beginarray = begin.split("-");
-            var begin = '';
-            for(i = 0; i < beginarray.length; i++) begin = begin + beginarray[i];
-        }
-        if(end.indexOf('-') != -1)
-        {
-            var endarray = end.split("-");
-            var end = '';
-            for(i = 0 ; i < endarray.length ; i++) end = end + endarray[i];
-        }
-        location.href = createLink('testreport', 'edit', "reportID=" + reportID + "&from=" + from + "&begin=" + begin + "&end=" + end);
-    }
+var reportID = <?php echo $report->id;?>;
+var from     = '<?php echo $from;?>';
+var method   = 'edit';
 </script>
 <?php include '../../common/view/footer.html.php';?>