diff --git a/module/common/view/datatable.fix.html.php b/module/common/view/datatable.fix.html.php
index c51f1a56c9..cf7801bc0b 100644
--- a/module/common/view/datatable.fix.html.php
+++ b/module/common/view/datatable.fix.html.php
@@ -105,7 +105,7 @@ $(function()
               <td><?php echo html::radio('showAllModule', $lang->datatable->showAllModuleList, isset($config->execution->task->allModule) ? $config->execution->task->allModule : 0);?></td>
             </tr>
             <?php endif;?>
-            <?php if(!empty($product) and $product->type != 'normal' and $this->app->tab == 'product' or $this->app->tab == 'qa'):?>
+            <?php if(!empty($product) and $product->type != 'normal' and ($this->app->tab == 'product' or $this->app->tab == 'qa')):?>
             <tr>
               <td><?php echo $lang->datatable->showBranch;?></td>
               <td><?php echo html::radio('showBranch', $lang->datatable->showBranchList, isset($config->$currentModule->$currentMethod->showBranch) ? $config->$currentModule->$currentMethod->showBranch : 1);?></td>
diff --git a/module/execution/control.php b/module/execution/control.php
index 1146acd555..c427af1184 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1382,7 +1382,7 @@ class execution extends control
         $this->view->code                = $code;
         $this->view->team                = $team;
         $this->view->teams               = array(0 => '') + $this->execution->getTeamPairsByProject((int)$projectID);
-        $this->view->allProjects         = array(0 => '') + $this->project->getPairsByModel($model = 'all', $programID = 0, $param = 'noclosed');
+        $this->view->allProjects         = array(0 => '') + $this->project->getPairsByModel('all', 0, 'noclosed');
         $this->view->executionID         = $executionID;
         $this->view->productID           = $productID;
         $this->view->projectID           = $projectID;
@@ -1538,7 +1538,7 @@ class execution extends control
         $this->view->qdUsers              = $qdUsers;
         $this->view->rdUsers              = $rdUsers;
         $this->view->users                = $this->user->getPairs('nodeleted|noclosed');
-        $this->view->allProjects          = $this->project->getPairsByModel($model = 'all', $programID = 0, $param = 'noclosed');
+        $this->view->allProjects          = $this->project->getPairsByModel('all', 0, 'noclosed');
         $this->view->groups               = $this->loadModel('group')->getPairs();
         $this->view->allProducts          = $allProducts;
         $this->view->linkedProducts       = $linkedProducts;
@@ -1619,7 +1619,7 @@ class execution extends control
         $this->view->position[]      = $this->lang->execution->batchEdit;
         $this->view->executionIDList = $executionIDList;
         $this->view->executions      = $executions;
-        $this->view->allProjects     = $this->project->getPairsByModel($model = 'all', $programID = 0, $param = 'noclosed');
+        $this->view->allProjects     = $this->project->getPairsByModel('all', 0, 'noclosed');
         $this->view->pmUsers         = $pmUsers;
         $this->view->poUsers         = $poUsers;
         $this->view->qdUsers         = $qdUsers;