diff options
author | Sam Rose <sam@gitlab.com> | 2017-04-18 14:01:15 -0400 |
---|---|---|
committer | Sam Rose <sam@gitlab.com> | 2017-04-28 13:02:57 -0400 |
commit | 575d9027d952f22949c60539e9b6384b04c2c75b (patch) | |
tree | d2a93912ab3f856e1786ac435b3f4e362df53047 /app/assets | |
parent | 1f47b570b93b64df8b365865431eef8d04cd79e4 (diff) | |
download | gitlab-ce-575d9027d952f22949c60539e9b6384b04c2c75b.tar.gz |
Display check next to assigned user in dropdown
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/users_select.js | 5 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/users_select.js b/app/assets/javascripts/users_select.js index 0344ce9ffb4..61157372f42 100644 --- a/app/assets/javascripts/users_select.js +++ b/app/assets/javascripts/users_select.js @@ -42,7 +42,6 @@ showAnyUser = $dropdown.data('any-user'); firstUser = $dropdown.data('first-user'); options.authorId = $dropdown.data('author-id'); - selectedId = $dropdown.data('selected'); defaultLabel = $dropdown.data('default-label'); issueURL = $dropdown.data('issueUpdate'); $selectbox = $dropdown.closest('.selectbox'); @@ -51,6 +50,7 @@ $value = $block.find('.value'); $collapsedSidebar = $block.find('.sidebar-collapsed-user'); $loading = $block.find('.block-loading').fadeOut(); + selectedId = $dropdown.data('selected') || showNullUser ? 0 : null; var updateIssueBoardsIssue = function () { $loading.removeClass('hidden').fadeIn(); @@ -208,9 +208,9 @@ page = $('body').data('page'); isIssueIndex = page === 'projects:issues:index'; isMRIndex = (page === page && page === 'projects:merge_requests:index'); + selectedId = user.id; if ($dropdown.hasClass('js-filter-bulk-update') || $dropdown.hasClass('js-issuable-form-dropdown')) { e.preventDefault(); - selectedId = user.id; if (selectedId === gon.current_user_id) { $('.assign-to-me-link').hide(); } else { @@ -221,7 +221,6 @@ if ($el.closest('.add-issues-modal').length) { gl.issueBoards.ModalStore.store.filter[$dropdown.data('field-name')] = user.id; } else if ($dropdown.hasClass('js-filter-submit') && (isIssueIndex || isMRIndex)) { - selectedId = user.id; return Issuable.filterResults($dropdown.closest('form')); } else if ($dropdown.hasClass('js-filter-submit')) { return $dropdown.closest('form').submit(); diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index 1313ea25c2a..73ded9f30d4 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -390,7 +390,8 @@ &::before { position: absolute; left: 6px; - top: 6px; + top: 50%; + transform: translateY(-50%); font: normal normal normal 14px/1 FontAwesome; font-size: inherit; text-rendering: auto; |