From 7a44cc96ce57eaf54c6d67d2ab04ee2834ef4ff1 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 17 Dec 2014 06:06:09 +0000
Subject: [PATCH]  * adjust code for batch assignto.

---
 module/bug/js/browse.js          |  2 +-
 module/product/js/browse.js      |  2 +-
 module/project/css/bug.css       |  4 ++++
 module/project/js/bug.js         | 17 +++++++++++++++++
 module/project/js/task.js        |  2 +-
 module/project/view/bug.html.php | 20 +++++++++++++++-----
 6 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/module/bug/js/browse.js b/module/bug/js/browse.js
index db0315a2f4..efe5f48513 100644
--- a/module/bug/js/browse.js
+++ b/module/bug/js/browse.js
@@ -15,7 +15,7 @@ $(document).ready(function()
         $('.assign-menu > .option').each(function()
         {
             var $option = $(this);
-            $option.toggleClass('hide', $option.text().toLowerCase().indexOf(val) < 0 || $option.data('key').toLowerCase().indexOf(val) < 0);
+            $option.toggleClass('hide', $option.text().toString().toLowerCase().indexOf(val) < 0 && $option.data('key').toString().toLowerCase().indexOf(val) < 0);
         });
     });
 });
diff --git a/module/product/js/browse.js b/module/product/js/browse.js
index 1f9386fd99..526af793d2 100644
--- a/module/product/js/browse.js
+++ b/module/product/js/browse.js
@@ -13,7 +13,7 @@ $(function()
         $('.assign-menu > .option').each(function()
         {
             var $option = $(this);
-            $option.toggleClass('hide', $option.text().toLowerCase().indexOf(val) < 0 || $option.data('key').toLowerCase().indexOf(val) < 0);
+            $option.toggleClass('hide', $option.text().toString().toLowerCase().indexOf(val) < 0 && $option.data('key').toString().toLowerCase().indexOf(val) < 0);
         });
     });
 })
diff --git a/module/project/css/bug.css b/module/project/css/bug.css
index e69de29bb2..c48171968a 100644
--- a/module/project/css/bug.css
+++ b/module/project/css/bug.css
@@ -0,0 +1,4 @@
+.assign-menu {min-width: 150px; overflow: hidden; max-height: 305px}
+.assign-menu.with-search {padding-bottom: 34px;}
+.assign-menu > .assign-search {padding: 0; position: absolute; z-index: 0; bottom: 0; left: 0; right: 0}
+.assign-menu > .assign-search .input-group-addon {position: absolute; right: 10px; top: 0; z-index: 10; background: none; border: none; color: #666}
diff --git a/module/project/js/bug.js b/module/project/js/bug.js
index e69de29bb2..edc2cbb4fa 100644
--- a/module/project/js/bug.js
+++ b/module/project/js/bug.js
@@ -0,0 +1,17 @@
+$(document).ready(function()
+{
+    $('.assign-search').click(function(e)
+    {
+        e.stopPropagation();
+        return false;
+    }).on('keyup change paste', 'input', function()
+    {
+        var val = $(this).val().toLowerCase();
+        if(val == '') return $('.assign-menu > .option').removeClass('hide');
+        $('.assign-menu > .option').each(function()
+        {
+            var $option = $(this);
+            $option.toggleClass('hide', $option.text().toString().toLowerCase().indexOf(val) < 0 && $option.data('key').toString().toLowerCase().indexOf(val) < 0);
+        });
+    });
+});
diff --git a/module/project/js/task.js b/module/project/js/task.js
index ba462632b8..d4a0c465ba 100644
--- a/module/project/js/task.js
+++ b/module/project/js/task.js
@@ -15,7 +15,7 @@ $(function()
         $('.assign-menu > .option').each(function()
         {
             var $option = $(this);
-            $option.toggleClass('hide', $option.text().toLowerCase().indexOf(val) < 0 || $option.data('key').toLowerCase().indexOf(val) < 0);
+            $option.toggleClass('hide', $option.text().toString().toLowerCase().indexOf(val) < 0 && $option.data('key').toString().toLowerCase().indexOf(val) < 0);
         });
     });
 });
diff --git a/module/project/view/bug.html.php b/module/project/view/bug.html.php
index 13aa5c0b3f..fe4a947429 100644
--- a/module/project/view/bug.html.php
+++ b/module/project/view/bug.html.php
@@ -75,12 +75,22 @@
               echo "<div class='btn-group'>" . html::selectButton() . '</div>';
               if($canBatchAssignTo)
               {
+                  $withSearch = count($memberPairs) > 10;
                   $actionLink = $this->createLink('bug', 'batchAssignTo', "projectID={$project->id}&type=project");
-                  echo "<div class='input-group w-150px'>";
-                  echo html::select('assignedTo', $memberPairs, '', 'class="form-control chosen"');
-                  echo "<span class='input-group-addon'>";
-                  echo html::a("javascript:setFormAction(\"$actionLink\")", $lang->bug->assignTo);
-                  echo '</span></div>';
+                  echo html::select('assignedTo', $memberPairs, '', 'class="hidden"');
+                  echo '<div class="dropup btn-group">';
+                  echo '<button class="btn dropdown-toggle" type="button" data-toggle="dropdown">';
+                  echo $lang->bug->assignedTo;
+                  echo '<span class="caret"></span></button>';
+                  echo '<ul class="dropdown-menu assign-menu' . ($withSearch ? ' with-search':'') . '" role="menu">';
+                  foreach ($memberPairs as $key => $value)
+                  {
+                      if(empty($key)) continue;
+                      echo "<li class='option' data-key='$key'>" . html::a("javascript:$(\"#assignedTo\").val(\"$key\");setFormAction(\"$actionLink\")", $value, '', '') . '</li>';
+                  }
+                  if($withSearch) echo "<li class='assign-search'><div class='input-group input-group-sm'><input type='text' class='form-control' placeholder=''><span class='input-group-addon'><i class='icon-search'></i></span></div></li>";
+                  echo '</ul>';
+                  echo '</div>';
               }
           }
           ?>