diff --git a/module/bug/control.php b/module/bug/control.php index a991277dc6..fc9cda023a 100755 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -852,7 +852,7 @@ class bug extends control $this->view->users = $this->user->getPairs('devfirst|noclosed'); $this->view->projects = array('' => '') + $this->product->getProjectPairsByProduct($productID, $branch ? "0,$branch" : 0, 'id_desc', $projectID); $this->view->projectID = $projectID; - $this->view->executions = array('' => '') + $this->product->getExecutionPairsByProduct($productID, $branch ? "0,$branch" : 0, 'id_desc', $projectID); + $this->view->executions = array('' => '') + $this->product->getExecutionPairsByProduct($productID, $branch ? "0,$branch" : 0, 'id_desc', $projectID, 'multiple'); $this->view->executionID = $executionID; $this->view->moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'bug', $startModuleID = 0, $branch === 'all' ? 0 : $branch); $this->view->moduleID = $moduleID; diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php index 6f08e7e016..c93fe27e54 100755 --- a/module/bug/view/batchcreate.html.php +++ b/module/bug/view/batchcreate.html.php @@ -105,7 +105,7 @@ foreach(explode(',', $config->bug->create->requiredFields) as $field) branchBox' style='overflow:visible'> - projectBox' style='overflow:visible'> + projectBox' style='overflow:visible'> executionBox' style='overflow:visible'> diff --git a/module/product/control.php b/module/product/control.php index 6681459afd..b13fcb690c 100755 --- a/module/product/control.php +++ b/module/product/control.php @@ -976,8 +976,15 @@ class product extends control */ public function ajaxGetExecutionsByProject($productID, $projectID = 0, $branch = 0, $number = 0) { - $executions = $this->product->getExecutionPairsByProduct($productID, $branch, 'id_desc', $projectID, ''); - return print(html::select('executions' . "[$number]", array('' => '') + $executions, 0, "class='form-control' onchange='loadExecutionBuilds($productID, this.value, $number)'")); + $noMultipleExecutionID = $projectID ? $this->loadModel('execution')->getNoMultipleID($projectID) : ''; + $executions = $this->product->getExecutionPairsByProduct($productID, $branch, 'id_desc', $projectID, 'multiple'); + + $disabled = $noMultipleExecutionID ? "disabled='disabled'" : ''; + $html = html::select("executions[{$number}]", array('' => '') + $executions, 0, "class='form-control' onchange='loadExecutionBuilds($productID, this.value, $number)' $disabled"); + + if($noMultipleExecutionID) $html .= html::hidden("executions[{$number}]", $noMultipleExecutionID, "id=executions{$number}"); + + return print($html); } /**