diff options
author | Sam Rose <sam@gitlab.com> | 2017-04-29 21:16:50 -0400 |
---|---|---|
committer | Sam Rose <sam@gitlab.com> | 2017-04-29 21:16:50 -0400 |
commit | e12d754b0495c5cc600f98f4e623377b76d51831 (patch) | |
tree | 10dc6ff51427502b04add10783a5ca820c3f5e2f /app/assets | |
parent | 575d9027d952f22949c60539e9b6384b04c2c75b (diff) | |
download | gitlab-ce-e12d754b0495c5cc600f98f4e623377b76d51831.tar.gz |
Add option to select the null user as the default
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/users_select.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/assets/javascripts/users_select.js b/app/assets/javascripts/users_select.js index 61157372f42..0756def68af 100644 --- a/app/assets/javascripts/users_select.js +++ b/app/assets/javascripts/users_select.js @@ -30,7 +30,7 @@ $els.each((function(_this) { return function(i, dropdown) { var options = {}; - var $block, $collapsedSidebar, $dropdown, $loading, $selectbox, $value, abilityName, assignTo, assigneeTemplate, collapsedAssigneeTemplate, defaultLabel, firstUser, issueURL, selectedId, showAnyUser, showNullUser, showMenuAbove; + var $block, $collapsedSidebar, $dropdown, $loading, $selectbox, $value, abilityName, assignTo, assigneeTemplate, collapsedAssigneeTemplate, defaultLabel, defaultNullUser, firstUser, issueURL, selectedId, showAnyUser, showNullUser, showMenuAbove; $dropdown = $(dropdown); options.projectId = $dropdown.data('project-id'); options.groupId = $dropdown.data('group-id'); @@ -38,6 +38,7 @@ options.todoFilter = $dropdown.data('todo-filter'); options.todoStateFilter = $dropdown.data('todo-state-filter'); showNullUser = $dropdown.data('null-user'); + defaultNullUser = $dropdown.data('null-user-default'); showMenuAbove = $dropdown.data('showMenuAbove'); showAnyUser = $dropdown.data('any-user'); firstUser = $dropdown.data('first-user'); @@ -50,7 +51,8 @@ $value = $block.find('.value'); $collapsedSidebar = $block.find('.sidebar-collapsed-user'); $loading = $block.find('.block-loading').fadeOut(); - selectedId = $dropdown.data('selected') || showNullUser ? 0 : null; + selectedId = $dropdown.data('selected'); + if (!selectedId) selectedId = (defaultNullUser && showNullUser) ? 0 : null; var updateIssueBoardsIssue = function () { $loading.removeClass('hidden').fadeIn(); |