Merge branch 'devops21_zhangzilong_19319' into 'master'

# Fix bug #19319.

See merge request easycorp/zentaopms!1782

module/testtask/control.php

@@ -1435,7 +1435,7 @@ class testtask extends control
         $testTasks = $this->testtask->getUserTestTaskPairs($account, 0, $status);
 
         if($id) return print(html::select("testtasks[$id]", $testTasks, '', 'class="form-control"'));
-        return print(html::select('testtask', $testTasks, '', 'class=form-control'));
+        return print(html::select('testtask', $testTasks, '', 'class="form-control"'));
     }
 
     /**

module/testtask/model.php

@@ -1069,7 +1069,8 @@ class testtaskModel extends model
         $testtaskPairs = array();
         while($testtask = $stmt->fetch())
         {
-            $testtaskPairs[$testtask->id] = $testtask->execution . ' / ' . $testtask->name;
+            if($testtask->execution) $testtask->execution .= " / ";
+            $testtaskPairs[$testtask->id] = $testtask->execution . $testtask->name;
         }
         return $testtaskPairs;
     }