Merge branch 'master_feedback_1422' into 'master'

* Resolved feedback #1422.

See merge request easycorp/zentaopms!6160
This commit is contained in:
王怡栋
2022-11-15 08:31:10 +00:00
4 changed files with 6 additions and 6 deletions
+2 -2
View File
@@ -998,7 +998,7 @@ class execution extends control
* @access public
* @return void
*/
public function bug($executionID = 0, $productID = 0, $branch = 0, $orderBy = 'status,id_desc', $build = 0, $type = 'all', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
public function bug($executionID = 0, $productID = 0, $branch = 'all', $orderBy = 'status,id_desc', $build = 0, $type = 'all', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
/* Load these two models. */
$this->loadModel('bug');
@@ -1165,7 +1165,7 @@ class execution extends control
* @access public
* @return void
*/
public function testcase($executionID = 0, $productID = 0, $branchID = 0, $type = 'all', $moduleID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
public function testcase($executionID = 0, $productID = 0, $branchID = 'all', $type = 'all', $moduleID = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
$this->loadModel('testcase');
$this->loadModel('testtask');