diff --git a/app/assets/javascripts/boards/components/modal/filters/label.js.es6 b/app/assets/javascripts/boards/components/modal/filters/label.js.es6 index a95ef90f97f..ac5fbc487d9 100644 --- a/app/assets/javascripts/boards/components/modal/filters/label.js.es6 +++ b/app/assets/javascripts/boards/components/modal/filters/label.js.es6 @@ -1,5 +1,6 @@ +/* eslint-disable no-new */ /* global Vue */ -/* global LabelSelect */ +/* global LabelsSelect */ (() => { gl.issueBoards.ModalLabelFilter = Vue.extend({ props: { diff --git a/app/assets/javascripts/boards/components/modal/filters/milestone.js.es6 b/app/assets/javascripts/boards/components/modal/filters/milestone.js.es6 index 0511ffe81a7..e84345ddc2b 100644 --- a/app/assets/javascripts/boards/components/modal/filters/milestone.js.es6 +++ b/app/assets/javascripts/boards/components/modal/filters/milestone.js.es6 @@ -1,3 +1,4 @@ +/* eslint-disable no-new */ /* global Vue */ /* global MilestoneSelect */ (() => { diff --git a/app/assets/javascripts/boards/components/modal/filters/user.js.es6 b/app/assets/javascripts/boards/components/modal/filters/user.js.es6 index d45649af4cd..6462e1fe2af 100644 --- a/app/assets/javascripts/boards/components/modal/filters/user.js.es6 +++ b/app/assets/javascripts/boards/components/modal/filters/user.js.es6 @@ -1,3 +1,4 @@ +/* eslint-disable no-new */ /* global Vue */ /* global UsersSelect */ (() => { diff --git a/app/assets/javascripts/boards/components/modal/index.js.es6 b/app/assets/javascripts/boards/components/modal/index.js.es6 index cab7d576194..30c0098d35f 100644 --- a/app/assets/javascripts/boards/components/modal/index.js.es6 +++ b/app/assets/javascripts/boards/components/modal/index.js.es6 @@ -67,22 +67,22 @@ this.loadIssues(true); }, deep: true, - } + }, }, methods: { searchOperation: _.debounce(function searchOperationDebounce() { this.loadIssues(true); }, 500), loadIssues(clearIssues = false) { - if (!this.showAddIssuesModal) return; + if (!this.showAddIssuesModal) return false; - const data = Object.assign({}, this.filter, { + const queryData = Object.assign({}, this.filter, { search: this.searchTerm, page: this.page, per: this.perPage, }); - return gl.boardService.getBacklog(data).then((res) => { + return gl.boardService.getBacklog(queryData).then((res) => { const data = res.json(); if (clearIssues) { diff --git a/app/assets/javascripts/milestone_select.js b/app/assets/javascripts/milestone_select.js index a026f178720..6ca60676fc1 100644 --- a/app/assets/javascripts/milestone_select.js +++ b/app/assets/javascripts/milestone_select.js @@ -6,7 +6,7 @@ (function() { this.MilestoneSelect = (function() { function MilestoneSelect(currentProject, els) { - var _this; + var _this, $els; if (currentProject != null) { _this = this; this.currentProject = JSON.parse(currentProject); @@ -18,7 +18,7 @@ $els = $('.js-label-select'); } - $('.js-milestone-select').each(function(i, dropdown) { + $els.each(function(i, dropdown) { var $block, $dropdown, $loading, $selectbox, $sidebarCollapsedValue, $value, abilityName, collapsedSidebarLabelTemplate, defaultLabel, issuableId, issueUpdateURL, milestoneLinkNoneTemplate, milestoneLinkTemplate, milestonesUrl, projectId, selectedMilestone, showAny, showNo, showUpcoming, useId, showMenuAbove; $dropdown = $(dropdown); projectId = $dropdown.data('project-id'); diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss index 0d336a34131..b362cc758cc 100644 --- a/app/assets/stylesheets/pages/boards.scss +++ b/app/assets/stylesheets/pages/boards.scss @@ -392,7 +392,8 @@ &.add-issues-empty-state-filter { -webkit-flex-direction: column; flex-direction: column; - margin-top: 50px; + -webkit-justify-content: center; + justify-content: center; } > .row {