Fix unassigned checkmark

1 files changed, 16 insertions, 5 deletions

diff --git a/app/assets/javascripts/users_select.js b/app/assets/javascripts/users_select.js
index 8119a8cd000..1724ca86b61 100644
--- a/app/assets/javascripts/users_select.js
+++ b/app/assets/javascripts/users_select.js
@@ -50,7 +50,11 @@ function UsersSelect(currentUser, els) {
       $collapsedSidebar = $block.find('.sidebar-collapsed-user');
       $loading = $block.find('.block-loading').fadeOut();
       selectedIdDefault = (defaultNullUser && showNullUser) ? 0 : null;
-      selectedId = $dropdown.data('selected') || selectedIdDefault;
+      selectedId = $dropdown.data('selected');
+
+      if (selectedId === undefined) {
+        selectedId = selectedIdDefault;
+      }
 
       const assignYourself = function () {
         const unassignedSelected = $dropdown.closest('.selectbox')
@@ -423,8 +427,9 @@ function UsersSelect(currentUser, els) {
         },
         opened: function(e) {
           const $el = $(e.currentTarget);
-          if ($dropdown.hasClass('js-issue-board-sidebar')) {
-            selectedId = parseInt($dropdown[0].dataset.selected, 10) || selectedIdDefault;
+          const selected = getSelected();
+          if ($dropdown.hasClass('js-issue-board-sidebar') && selected.length === 0) {
+            this.addInput($dropdown.data('field-name'), 0, {});
           }
           $el.find('.is-active').removeClass('is-active');
 
@@ -432,8 +437,10 @@ function UsersSelect(currentUser, els) {
             $el.find(`li[data-user-id="${id}"] .dropdown-menu-user-link`).addClass('is-active');
           }
 
-          if ($selectbox[0]) {
+          if (selected.length > 0) {
             getSelected().forEach(selectedId => highlightSelected(selectedId));
+          } else if ($dropdown.hasClass('js-issue-board-sidebar')) {
+            highlightSelected(0);
           } else {
             highlightSelected(selectedId);
           }
@@ -444,15 +451,19 @@ function UsersSelect(currentUser, els) {
           username = user.username ? "@" + user.username : "";
           avatar = user.avatar_url ? user.avatar_url : false;
 
-          let selected = user.id === parseInt(selectedId, 10);
+          let selected = false;
 
           if (this.multiSelect) {
+            selected = getSelected().find(u => user.id === u);
+
             const fieldName = this.fieldName;
             const field = $dropdown.closest('.selectbox').find("input[name='" + fieldName + "'][value='" + user.id + "']");
 
             if (field.length) {
               selected = true;
             }
+          } else {
+            selected = user.id === selectedId;
           }
 
           img = "";