diff --git a/module/build/control.php b/module/build/control.php index d7ca71bae2..2d4b63c3a5 100644 --- a/module/build/control.php +++ b/module/build/control.php @@ -177,7 +177,7 @@ class build extends control { $productGroups = $this->product->getProducts($build->project); $branches = $this->loadModel('branch')->getList($build->product, $build->project, 'all'); - $builds = $this->build->getBuildPairs($build->product, $build->branch, 'noempty,notrunk,separate,noproject', $build->project, 'project'); + $builds = $this->build->getBuildPairs($build->product, $build->branch, 'noempty,notrunk,separate', $build->project, 'project', $build->builds, false); } $executions = $this->product->getExecutionPairsByProduct($build->product, $build->branch, 'id_desc', $this->session->project, 'stagefilter'); @@ -450,7 +450,7 @@ class build extends control } if(empty($projectID)) return $this->ajaxGetProductBuilds($productID, $varName, $build, $branch, $index, $type); - $builds = $this->build->getBuildPairs($productID, $branch, $type, $projectID, 'project', $build); + $builds = $this->build->getBuildPairs($productID, $branch, $type, $projectID, 'project', $build, false); if(strpos($extra, 'multiple') !== false) $varName .= '[]'; if($isJsonView) return print(json_encode($builds)); return print(html::select($varName, $builds, $build, "class='form-control chosen' $extra")); diff --git a/module/build/js/create.js b/module/build/js/create.js index c70dafe3f1..6bb0d9337b 100644 --- a/module/build/js/create.js +++ b/module/build/js/create.js @@ -12,7 +12,7 @@ $().ready(function() $.get(createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=builds&build=&branch=' + branch + '&index=&needCreate=&type=noempty,notrunk,separate,noproject&extra=multiple'), function(data) { if(data) $('#buildBox').html(data); - $('#builds').chosen(); + $('#builds').attr('data-placeholder', multipleSelect).chosen(); }); }); diff --git a/module/build/js/edit.js b/module/build/js/edit.js index 51703ab620..f77ec85bd9 100644 --- a/module/build/js/edit.js +++ b/module/build/js/edit.js @@ -14,7 +14,7 @@ $().ready(function() $.get(createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=builds&build=&branch=' + branch + '&index=&needCreate=&type=noempty,notrunk,separate,noproject&extra=multiple'), function(data) { if(data) $('#buildBox').html(data); - $('#builds').chosen(); + $('#builds').attr('data-placeholder', multipleSelect).chosen(); }); } }); diff --git a/module/build/lang/zh-cn.php b/module/build/lang/zh-cn.php index 13da7f11b3..8f686f1cac 100644 --- a/module/build/lang/zh-cn.php +++ b/module/build/lang/zh-cn.php @@ -65,8 +65,9 @@ $lang->build->resolvedBugs = ' 本次共解决 %s 个Bug'; $lang->build->createdBugs = ' 本次共产生 %s 个Bug'; $lang->build->placeholder = new stdclass(); -$lang->build->placeholder->scmPath = ' 软件源代码库,如Subversion、Git库地址'; -$lang->build->placeholder->filePath = ' 该版本软件包下载存储地址'; +$lang->build->placeholder->scmPath = ' 软件源代码库,如Subversion、Git库地址'; +$lang->build->placeholder->filePath = ' 该版本软件包下载存储地址'; +$lang->build->placeholder->multipleSelect = "版本支持多选"; $lang->build->action = new stdclass(); $lang->build->action->buildopened = '$date, 由 $actor 创建版本 $extra。' . "\n"; diff --git a/module/build/view/create.html.php b/module/build/view/create.html.php index e7b45afe8f..c097424ee5 100644 --- a/module/build/view/create.html.php +++ b/module/build/view/create.html.php @@ -52,7 +52,7 @@