From 2fb836640599fddaf62578b45b9288746fc8158b Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Wed, 30 Nov 2022 02:49:37 +0000
Subject: [PATCH]  * Finish task #77615,#77616.

---
 module/bug/control.php               | 23 ++++++-----
 module/bug/js/batchcreate.js         |  6 ++-
 module/bug/js/common.js              | 59 +++++++++++++++++-----------
 module/bug/view/batchcreate.html.php | 10 +++--
 module/bug/view/browse.html.php      |  2 +-
 module/bug/view/create.html.php      |  4 +-
 module/bug/view/edit.html.php        |  6 ++-
 module/bug/view/resolve.html.php     |  8 ++--
 module/build/lang/de.php             |  1 +
 module/build/lang/en.php             |  1 +
 module/build/lang/fr.php             |  1 +
 module/build/lang/zh-cn.php          |  1 +
 module/release/model.php             |  3 +-
 13 files changed, 80 insertions(+), 45 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 9fb4edfa17..c6b83e8351 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -228,6 +228,7 @@ class bug extends control
         $this->view->projectProducts = $this->product->getProducts($this->projectID);
         $this->view->productName     = $productName;
         $this->view->builds          = $this->loadModel('build')->getBuildPairs($productID, $branch, 'withreleased');
+        $this->view->releasedBuilds  = $this->loadModel('release')->getReleasedBuilds($productID, $branch);
         $this->view->modules         = $this->tree->getOptionMenu($productID, $viewType = 'bug', $startModuleID = 0, $branch);
         $this->view->moduleTree      = $moduleTree;
         $this->view->moduleName      = $moduleID ? $this->tree->getById($moduleID)->name : $this->lang->tree->all;
@@ -655,6 +656,7 @@ class bug extends control
         $this->view->projectExecutionPairs = $this->loadModel('project')->getProjectExecutionPairs();
         $this->view->executions            = defined('TUTORIAL') ? $this->loadModel('tutorial')->getExecutionPairs() : $executions;
         $this->view->builds                = $builds;
+        $this->view->releasedBuilds        = $this->loadModel('release')->getReleasedBuilds($productID, $branch);
         $this->view->moduleID              = (int)$moduleID;
         $this->view->projectID             = $projectID;
         $this->view->projectModel          = $projectModel;
@@ -852,6 +854,7 @@ class bug extends control
         $this->view->productID        = $productID;
         $this->view->stories          = $stories;
         $this->view->builds           = $builds;
+        $this->view->releasedBuilds   = $this->loadModel('release')->getReleasedBuilds($productID, $branch);
         $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;
@@ -1184,6 +1187,7 @@ class bug extends control
         $this->view->cases                 = array('' => '') + $cases;
         $this->view->openedBuilds          = $openedBuilds;
         $this->view->resolvedBuilds        = array('' => '') + $openedBuilds + $oldResolvedBuild;
+        $this->view->releasedBuilds        = $this->loadModel('release')->getReleasedBuilds($productID, $branch);
         $this->view->actions               = $this->action->getList('bug', $bugID);
 
         $this->display();
@@ -1828,15 +1832,16 @@ class bug extends control
         $this->bug->checkBugExecutionPriv($bug);
         $this->qa->setMenu($this->products, $productID, $bug->branch);
 
-        $this->view->title       = $this->products[$productID] . $this->lang->colon . $this->lang->bug->resolve;
-        $this->view->bug         = $bug;
-        $this->view->users       = $users;
-        $this->view->assignedTo  = $assignedTo;
-        $this->view->productBugs = $productBugs;
-        $this->view->executions  = $this->loadModel('product')->getExecutionPairsByProduct($productID, $bug->branch ? "0,{$bug->branch}" : 0, 'id_desc', $projectID, 'stagefilter');
-        $this->view->builds      = $this->loadModel('build')->getBuildPairs($productID, $bug->branch, 'withbranch');
-        $this->view->actions     = $this->action->getList('bug', $bugID);
-        $this->view->execution   = isset($execution) ? $execution : '';
+        $this->view->title          = $this->products[$productID] . $this->lang->colon . $this->lang->bug->resolve;
+        $this->view->bug            = $bug;
+        $this->view->users          = $users;
+        $this->view->assignedTo     = $assignedTo;
+        $this->view->productBugs    = $productBugs;
+        $this->view->executions     = $this->loadModel('product')->getExecutionPairsByProduct($productID, $bug->branch ? "0,{$bug->branch}" : 0, 'id_desc', $projectID, 'stagefilter');
+        $this->view->builds         = $this->loadModel('build')->getBuildPairs($productID, $bug->branch, 'withbranch');
+        $this->view->releasedBuilds = $this->loadModel('release')->getReleasedBuilds($productID, $branch);
+        $this->view->actions        = $this->action->getList('bug', $bugID);
+        $this->view->execution      = isset($execution) ? $execution : '';
         $this->display();
     }
 
diff --git a/module/bug/js/batchcreate.js b/module/bug/js/batchcreate.js
index a69fa47d0d..e3e8b36862 100644
--- a/module/bug/js/batchcreate.js
+++ b/module/bug/js/batchcreate.js
@@ -20,6 +20,8 @@ $(function()
     $('#dropMenu').css('z-index', 9999);
 })
 
+$('[name^=openedBuilds]').picker({optionRender: markReleasedBuilds, dropWidth: 'auto'});
+
 /**
  * Set opened builds.
  *
@@ -38,13 +40,13 @@ function setOpenedBuilds(link, index)
             var selected = $('#buildBox' + index).find('select').val();
             $('#buildBox' + index).html(builds);
             $('#buildBox' + index).find('select').val(selected);
-            $('#openedBuilds' + index + '_chosen').remove();
+            $('#pickerDropMenu-pk_openedBuild' + index).remove();
             $('#openedBuilds' + index).next('.picker').remove();
             $('#buildBox' + index + ' select').removeClass('select-3');
             $('#buildBox' + index + ' select').addClass('select-1');
             $('#buildBox' + index + ' select').attr('name','openedBuilds[' + index + '][]');
             $('#buildBox' + index + ' select').attr('id','openedBuilds' + index);
-            $('#buildBox' + index + ' select').chosen();
+            $('#buildBox' + index + ' select').picker({optionRender: markReleasedBuilds});
 
             index++;
             if($('#executions' + index).val() != 'ditto') break;
diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index e7baa1bba6..55e43ea467 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -19,6 +19,21 @@ $(function()
     }
 });
 
+$('#openedBuild, #resolvedBuild').picker({optionRender: markReleasedBuilds});
+
+function markReleasedBuilds($option)
+{
+    var build = $option.attr('data-value');
+    if($.inArray(build, releasedBuilds) != -1)
+    {
+        if(!$option.find('.label-released').length)
+        {
+            var optionText = $option.find('.picker-option-text').html();
+            $option.find('.picker-option-text').replaceWith("<p class='picker-option-text no-margin'><span class='label label-released label-primary label-outline'>" + releasedBuild + "</span> " + optionText + "</p>");
+        }
+    }
+}
+
 /**
  * Load all fields.
  *
@@ -186,9 +201,9 @@ function loadAllExecutionBuilds(executionID, productID, buildBox)
         {
             if(!data) data = '<select id="openedBuild" name="openedBuild" class="form-control" multiple=multiple></select>';
             $('#openedBuild').replaceWith(data);
-            $('#openedBuild_chosen').remove();
+            $('#pickerDropMenu-pk_openedBuild').remove();
             $('#openedBuild').next('.picker').remove();
-            $("#openedBuild").chosen();
+            $("#openedBuild").picker({optionRender: markReleasedBuilds});
             notice();
         })
     }
@@ -197,12 +212,12 @@ function loadAllExecutionBuilds(executionID, productID, buildBox)
         if(buildBox == 'openedBuildBox')
         {
             link = createLink('build', 'ajaxGetExecutionBuilds', 'executionID=' + executionID + '&productID=' + productID + '&varName=openedBuild&build=' + oldOpenedBuild + '&branch=' + branch + '&index=0&needCreate=true&type=all');
-            $('#openedBuildBox').load(link, function(){$(this).find('select').chosen()});
+            $('#openedBuildBox').load(link, function(){$(this).find('select').picker({optionRender: markReleasedBuilds})});
         }
         if(buildBox == 'resolvedBuildBox')
         {
             link = createLink('build', 'ajaxGetProductBuilds', 'productID=' + productID + '&varName=resolvedBuild&build=' + oldResolvedBuild + '&branch=' + branch + '&index=0&type=all');
-            $('#resolvedBuildBox').load(link, function(){$(this).find('select').chosen()});
+            $('#resolvedBuildBox').load(link, function(){$(this).find('select').picker({optionRender: markReleasedBuilds})});
         }
     }
 }
@@ -226,9 +241,9 @@ function loadAllProductBuilds(productID, buildBox)
         {
             if(!data) data = '<select id="openedBuild" name="openedBuild" class="form-control" multiple=multiple></select>';
             $('#openedBuild').replaceWith(data);
-            $('#openedBuild_chosen').remove();
+            $('#pickerDropMenu-pk_openedBuild').remove();
             $('#openedBuild').next('.picker').remove();
-            $("#openedBuild").chosen();
+            $("#openedBuild").picker({optionRender: markReleasedBuilds});
             notice();
         })
     }
@@ -237,12 +252,12 @@ function loadAllProductBuilds(productID, buildBox)
         if(buildBox == 'openedBuildBox')
         {
             link = createLink('build', 'ajaxGetProductBuilds', 'productID=' + productID + '&varName=openedBuild&build=' + oldOpenedBuild + '&branch=' + branch + '&index=0&type=all');
-            $('#openedBuildBox').load(link, function(){$(this).find('select').chosen()});
+            $('#openedBuildBox').load(link, function(){$(this).find('select').picker({optionRender: markReleasedBuilds})});
         }
         if(buildBox == 'resolvedBuildBox')
         {
             link = createLink('build', 'ajaxGetProductBuilds', 'productID=' + productID + '&varName=resolvedBuild&build=' + oldResolvedBuild + '&branch=' + branch + '&index=0&type=all');
-            $('#resolvedBuildBox').load(link, function(){$(this).find('select').chosen()});
+            $('#resolvedBuildBox').load(link, function(){$(this).find('select').picker({optionRender: markReleasedBuilds})});
         }
     }
 }
@@ -443,17 +458,17 @@ function loadProductBuilds(productID)
         {
             if(!data) data = '<select id="openedBuild" name="openedBuild" class="form-control" multiple=multiple></select>';
             $('#openedBuild').replaceWith(data);
-            $('#openedBuild_chosen').remove();
+            $('#pickerDropMenu-pk_openedBuild').remove();
             $('#openedBuild').next('.picker').remove();
-            $("#openedBuild").chosen();
+            $("#openedBuild").picker({optionRender: markReleasedBuilds});
             notice();
         })
     }
     else
     {
-        $('#openedBuildBox').load(link, function(){$(this).find('select').chosen()});
+        $('#openedBuildBox').load(link, function(){$(this).find('select').picker({optionRender: markReleasedBuilds})});
         link = createLink('build', 'ajaxGetProductBuilds', 'productID=' + productID + '&varName=resolvedBuild&build=' + oldResolvedBuild + '&branch=' + branch);
-        $('#resolvedBuildBox').load(link, function(){$(this).find('select').chosen()});
+        $('#resolvedBuildBox').load(link, function(){$(this).find('select').picker({optionRender: markReleasedBuilds})});
     }
 }
 
@@ -557,23 +572,23 @@ function loadProjectBuilds(projectID)
         var link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=openedBuild&build=&branch=' + branch);
         $.get(link, function(data)
         {
-            if(!data) data = '<select id="openedBuild" name="openedBuild" class="form-control" multiple=multiple></select>';
+            if(!data) data = '<select id="openedBuild" name="openedBuild" class="form-control picker-select" multiple=multiple></select>';
             $('#openedBuild').replaceWith(data);
             $('#openedBuild').val(oldOpenedBuild);
-            $('#openedBuild_chosen').remove();
+            $('#pickerDropMenu-pk_openedBuild').remove();
             $('#openedBuild').next('.picker').remove();
-            $("#openedBuild").chosen();
+            $("#openedBuild").picker({optionRender: markReleasedBuilds});
             notice();
         })
     }
     else
     {
         var link = createLink('build', 'ajaxGetProjectBuilds', 'projectID=' + projectID + '&productID=' + productID + '&varName=openedBuild&build=' + oldOpenedBuild + '&branch=' + branch);
-        $('#openedBuildBox').load(link, function(){$(this).find('select').val(oldOpenedBuild).chosen()});
+        $('#openedBuildBox').load(link, function(){$(this).find('select').val(oldOpenedBuild).picker({optionRender: markReleasedBuilds})});
 
         var oldResolvedBuild = $('#resolvedBuild').val() ? $('#resolvedBuild').val() : 0;
         var link             = createLink('build', 'ajaxGetProductBuilds', 'productID=' + productID + '&varName=resolvedBuild&build=' + oldResolvedBuild + '&branch=' + branch);
-        $('#resolvedBuildBox').load(link, function(){$(this).find('select').val(oldResolvedBuild).chosen()});
+        $('#resolvedBuildBox').load(link, function(){$(this).find('select').val(oldResolvedBuild).picker({optionRender: markReleasedBuilds})});
     }
 }
 
@@ -600,23 +615,23 @@ function loadExecutionBuilds(executionID, num)
         link = createLink('build', 'ajaxGetExecutionBuilds', 'executionID=' + executionID + '&productID=' + productID + '&varName=openedBuild&build=' + oldOpenedBuild + "&branch=" + branch + "&index=0&needCreate=true");
         $.get(link, function(data)
         {
-            if(!data) data = '<select id="openedBuild" name="openedBuild" class="form-control" multiple=multiple></select>';
+            if(!data) data = '<select id="openedBuild" name="openedBuild" class="form-control picker-select" multiple=multiple></select>';
             $('#openedBuild').replaceWith(data);
             $('#openedBuild').val(oldOpenedBuild);
-            $('#openedBuild_chosen').remove();
+            $('#pickerDropMenu-pk_openedBuild').remove();
             $('#openedBuild').next('.picker').remove();
-            $("#openedBuild").chosen();
+            $("#openedBuild").picker({optionRender: markReleasedBuilds});
             notice();
         })
     }
     else
     {
         link = createLink('build', 'ajaxGetExecutionBuilds', 'executionID=' + executionID + '&productID=' + productID + '&varName=openedBuild&build=' + oldOpenedBuild + '&branch=' + branch + '&index=0&needCreate=false&type=normal&number=' + num);
-        $('#openedBuildBox' + num).load(link, function(){$(this).find('select').val(oldOpenedBuild).chosen()});
+        $('#openedBuildBox' + num).load(link, function(){$(this).find('select').val(oldOpenedBuild).picker({optionRender: markReleaseBuilds})});
 
         oldResolvedBuild = $('#resolvedBuild').val() ? $('#resolvedBuild').val() : 0;
         link = createLink('build', 'ajaxGetProductBuilds', 'productID=' + productID + '&varName=resolvedBuild&build=' + oldResolvedBuild + '&branch=' + branch);
-        $('#resolvedBuildBox').load(link, function(){$(this).find('select').val(oldResolvedBuild).chosen()});
+        $('#resolvedBuildBox').load(link, function(){$(this).find('select').val(oldResolvedBuild).picker({optionRender: markReleasedBuilds})});
     }
 }
 
diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php
index c93fe27e54..edbca7f173 100755
--- a/module/bug/view/batchcreate.html.php
+++ b/module/bug/view/batchcreate.html.php
@@ -13,6 +13,8 @@
 <?php
 include '../../common/view/header.html.php';
 js::set('requiredFields', $config->bug->create->requiredFields);
+js::set('releasedBuilds', $releasedBuilds);
+js::set('releasedBuild', $lang->build->releasedBuild);
 ?>
 <?php
 $visibleFields  = array();
@@ -107,7 +109,7 @@ foreach(explode(',', $config->bug->create->requiredFields) as $field)
             <td><?php echo html::select("modules[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
             <td class='<?php echo zget($visibleFields, 'project', ' hidden')?> projectBox' style='overflow:visible'><?php echo html::select("projects[$i]", $projects, $projectID, "class='form-control chosen' onchange='loadProductExecutionsByProject($productID, this.value, $i)'");?></td>
             <td class='<?php echo zget($visibleFields, 'execution', ' hidden')?> executionBox' style='overflow:visible'><?php echo html::select("executions[$i]", $executions, $executionID, "class='form-control chosen' onchange='loadExecutionBuilds($productID, this.value, $i)'");?></td>
-            <td id='buildBox<?php echo $i;?>'><?php echo html::select("openedBuilds[$i][]", $builds, 'trunk', "class='form-control chosen' multiple");?></td>
+            <td id='buildBox<?php echo $i;?>'><?php echo html::select("openedBuilds[$i][]", $builds, 'trunk', "class='form-control picker-select' multiple");?></td>
             <td>
               <div class='input-group'>
                 <div class="input-control has-icon-right">
@@ -163,7 +165,7 @@ foreach(explode(',', $config->bug->create->requiredFields) as $field)
             <td><?php echo html::select("modules[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
             <td class='<?php echo zget($visibleFields, 'project', ' hidden')?> projectBox' style='overflow:visible'><?php echo html::select("projects[$i]", $projects, $projectID, "class='form-control chosen' onchange = 'loadProductExecutionsByProject($productID, this.value, $i)'");?></td>
             <td class='<?php echo zget($visibleFields, 'execution', ' hidden')?> executionBox' style='overflow:visible'><?php echo html::select("executions[$i]", $executions, $executionID, "class='form-control chosen' onchange='loadExecutionBuilds($productID, this.value, $i)'");?></td>
-            <td id='buildBox<?php echo $i;?>'><?php echo html::select("openedBuilds[$i][]", $builds, '', "class='form-control chosen' multiple");?></td>
+            <td id='buildBox<?php echo $i;?>'><?php echo html::select("openedBuilds[$i][]", $builds, '', "class='form-control picker-select' multiple");?></td>
             <td>
               <div class='input-group'>
                 <div class="input-control has-icon-right">
@@ -224,7 +226,7 @@ foreach(explode(',', $config->bug->create->requiredFields) as $field)
       <td><?php echo html::select("modules[%s]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
       <td class='<?php echo zget($visibleFields, 'project', ' hidden')?> projectBox' style='overflow:visible'><?php echo html::select("projects[%s]", $projects, $projectID, "class='form-control chosen' onchange = 'loadProductExecutionsByProject($productID, this.value, \"%s\")'");?></td>
       <td class='<?php echo zget($visibleFields, 'execution', ' hidden')?> executionBox' style='overflow:visible'><?php echo html::select("executions[%s]", $executions, $executionID, "class='form-control chosen' onchange='loadExecutionBuilds($productID, this.value, \"%s\")'");?></td>
-      <td id='buildBox%s'><?php echo html::select("openedBuilds[%s][]", $builds, '', "class='form-control chosen' multiple");?></td>
+      <td id='buildBox%s'><?php echo html::select("openedBuilds[%s][]", $builds, '', "class='form-control picker-select' multiple");?></td>
       <td>
         <div class='input-group'>
           <div class="input-control has-icon-right">
@@ -267,7 +269,7 @@ foreach(explode(',', $config->bug->create->requiredFields) as $field)
       <td><?php echo html::select("modules[$i]", $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></td>
       <td class='<?php echo zget($visibleFields, 'project', ' hidden')?> projectBox' style='overflow:visible'><?php echo html::select("projects[$i]", $projects, $projectID, "class='form-control chosen' onchange = 'loadProductExecutionsByProject($productID, this.value, $i)'");?></td>
       <td class='<?php echo zget($visibleFields, 'execution', ' hidden')?> executionBox' style='overflow:visible'><?php echo html::select("executions[$i]", $executions, $executionID, "class='form-control chosen' onchange='loadExecutionBuilds($productID, this.value, $i)'");?></td>
-      <td id='buildBox<?php echo $i;?>'><?php echo html::select("openedBuilds[$i][]", $builds, '', "class='form-control chosen' multiple");?></td>
+      <td id='buildBox<?php echo $i;?>'><?php echo html::select("openedBuilds[$i][]", $builds, '', "class='form-control picker-select' multiple");?></td>
       <td>
         <div class='input-group'>
           <div class="input-control has-icon-right">
diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 79c85912a5..0a665ed306 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -328,7 +328,7 @@ $currentBrowseType = isset($lang->bug->mySelects[$browseType]) && in_array($brow
                           {
                               $actionLink = $this->createLink('bug', 'batchResolve', "resolution=fixed&resolvedBuild=$key");
                               echo "<li class='option' data-key='$key'>";
-                              echo html::a('javascript:;', $build, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin', '#bugList')\"");
+                              echo html::a('javascript:;', (in_array($key, $releasedBuilds) ? "<span class='label label-primary label-outline'>{$lang->build->releasedBuild}</span> " : '') . $build, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin', '#bugList')\"");
                               echo "</li>";
                           }
                           echo "</ul>";
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index 1ff2b23c25..66f7f07cf1 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -30,6 +30,8 @@ js::set('tab', $this->app->tab);
 js::set('requiredFields', $config->bug->create->requiredFields);
 js::set('showFields', $showFields);
 js::set('projectExecutionPairs', $projectExecutionPairs);
+js::set('releasedBuilds', $releasedBuilds);
+js::set('releasedBuild', $lang->build->releasedBuild);
 if($this->app->tab == 'execution') js::set('objectID', zget($execution, 'id', ''));
 if($this->app->tab == 'project')   js::set('objectID', $projectID);
 ?>
@@ -128,7 +130,7 @@ if($this->app->tab == 'project')   js::set('objectID', $projectID);
             <td>
               <div class='input-group' id='buildBox'>
                 <span class="input-group-addon"><?php echo $lang->bug->openedBuild?></span>
-                <?php echo html::select('openedBuild[]', $builds, empty($buildID) ? '' : $buildID, "multiple=multiple class='chosen form-control'");?>
+                <?php echo html::select('openedBuild[]', $builds, empty($buildID) ? '' : $buildID, "multiple=multiple class='picker-select form-control'");?>
                 <span class='input-group-addon fix-border' id='buildBoxActions'></span>
                 <div class='input-group-btn'><?php echo html::commonButton($lang->bug->allBuilds, "class='btn' id='all' data-toggle='tooltip' onclick='loadAllBuilds()'")?></div>
               </div>
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index f2411a486b..3b9622b61d 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -30,6 +30,8 @@ js::set('bugID'                  , $bug->id);
 js::set('bugBranch'              , $bug->branch);
 js::set('isClosedBug'            , $bug->status == 'closed');
 js::set('projectExecutionPairs'  , $projectExecutionPairs);
+js::set('releasedBuilds'         , $releasedBuilds);
+js::set('releasedBuild'          , $lang->build->releasedBuild);
 if($this->app->tab == 'execution') js::set('objectID', $bug->execution);
 if($this->app->tab == 'project')   js::set('objectID', $bug->project);
 ?>
@@ -240,7 +242,7 @@ if($this->app->tab == 'project')   js::set('objectID', $bug->project);
                   <th><?php echo $lang->bug->openedBuild;?></th>
                   <td>
                     <div id='openedBuildBox' class='input-group'>
-                      <?php echo html::select('openedBuild[]', $openedBuilds, $bug->openedBuild, 'size=4 multiple=multiple class="chosen form-control"');?>
+                      <?php echo html::select('openedBuild[]', $openedBuilds, $bug->openedBuild, 'size=4 multiple=multiple class="picker-select form-control"');?>
                       <span class='input-group-btn'><?php echo html::commonButton($lang->bug->allBuilds, "class='btn' onclick='loadAllBuilds(this)'")?></span>
                     </div>
                   </td>
@@ -257,7 +259,7 @@ if($this->app->tab == 'project')   js::set('objectID', $bug->project);
                   <th><?php echo $lang->bug->resolvedBuild;?></th>
                   <td>
                     <div id='resolvedBuildBox' class='input-group'>
-                      <?php echo html::select('resolvedBuild', $resolvedBuilds, $bug->resolvedBuild, "class='form-control chosen'");?>
+                      <?php echo html::select('resolvedBuild', $resolvedBuilds, $bug->resolvedBuild, "class='form-control picker-select'");?>
                       <span class='input-group-btn'><?php echo html::commonButton($lang->bug->allBuilds, "class='btn' onclick='loadAllBuilds(this)'")?></span>
                     </div>
                   </td>
diff --git a/module/bug/view/resolve.html.php b/module/bug/view/resolve.html.php
index aea25327aa..cd5f7b99ae 100644
--- a/module/bug/view/resolve.html.php
+++ b/module/bug/view/resolve.html.php
@@ -14,8 +14,10 @@
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php
-js::set('page'      , 'resolve');
-js::set('productID' , $bug->product);
+js::set('page', 'resolve');
+js::set('productID', $bug->product);
+js::set('releasedBuilds', $releasedBuilds);
+js::set('releasedBuild', $lang->build->releasedBuild);
 ?>
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
@@ -49,7 +51,7 @@ js::set('productID' , $bug->product);
             </div>
           </td>
           <td>
-            <div id='resolvedBuildBox'><?php echo html::select('resolvedBuild', $builds, '', "class='form-control chosen'");?></div>
+            <div id='resolvedBuildBox'><?php echo html::select('resolvedBuild', $builds, '', "class='form-control picker-select'");?></div>
             <div id='newBuildBox' class='hidden required'><?php echo html::input('buildName', '', "class='form-control' placeholder='{$lang->bug->placeholder->newBuildName}'");?></div>
           </td>
           <td>
diff --git a/module/build/lang/de.php b/module/build/lang/de.php
index 58e816e8fe..7a2a91c575 100644
--- a/module/build/lang/de.php
+++ b/module/build/lang/de.php
@@ -36,6 +36,7 @@ $lang->build->execution      = $lang->executionCommon;
 $lang->build->integrated     = 'Integrated';
 $lang->build->singled        = 'Singled';
 $lang->build->builds         = 'Included Builds';
+$lang->build->releasedBuild  = 'Released Build';
 $lang->build->name           = 'Name';
 $lang->build->date           = 'Datum';
 $lang->build->builder        = 'Builder';
diff --git a/module/build/lang/en.php b/module/build/lang/en.php
index 1de167d912..82c9f24e2b 100644
--- a/module/build/lang/en.php
+++ b/module/build/lang/en.php
@@ -36,6 +36,7 @@ $lang->build->execution      = $lang->executionCommon;
 $lang->build->integrated     = 'Integrated';
 $lang->build->singled        = 'Singled';
 $lang->build->builds         = 'Included Builds';
+$lang->build->releasedBuild  = 'Released Build';
 $lang->build->name           = 'Name';
 $lang->build->date           = 'Date';
 $lang->build->builder        = 'Builder';
diff --git a/module/build/lang/fr.php b/module/build/lang/fr.php
index 68b572a9fe..f377e6afa7 100644
--- a/module/build/lang/fr.php
+++ b/module/build/lang/fr.php
@@ -36,6 +36,7 @@ $lang->build->execution      = $lang->executionCommon;
 $lang->build->integrated     = 'Integrated';
 $lang->build->singled        = 'Singled';
 $lang->build->builds         = 'Included Builds';
+$lang->build->releasedBuild  = 'Released Build';
 $lang->build->name           = 'Nom';
 $lang->build->date           = 'Date';
 $lang->build->builder        = 'Builder';
diff --git a/module/build/lang/zh-cn.php b/module/build/lang/zh-cn.php
index 2f8c8ae839..bd409bd9ce 100644
--- a/module/build/lang/zh-cn.php
+++ b/module/build/lang/zh-cn.php
@@ -36,6 +36,7 @@ $lang->build->execution      = '所属' . $lang->executionCommon;
 $lang->build->integrated     = '集成版本';
 $lang->build->singled        = '单一版本';
 $lang->build->builds         = '包含版本';
+$lang->build->releasedBuild  = '发布版本';
 $lang->build->name           = '名称编号';
 $lang->build->date           = '打包日期';
 $lang->build->builder        = '构建者';
diff --git a/module/release/model.php b/module/release/model.php
index 02094bef70..753ecde136 100644
--- a/module/release/model.php
+++ b/module/release/model.php
@@ -128,7 +128,8 @@ class releaseModel extends model
                 $inBranch = false;
                 foreach(explode(',', trim($release->branch, ',')) as $branchID)
                 {
-                    if(empty($branchID)) continue;
+                    if($branchID === '') continue;
+
                     if(strpos(",{$branch},", ",{$branchID},") !== false) $inBranch = true;
                 }
                 if(!$inBranch) continue;