Commit 773f1d2f authored by Phil Hughes's avatar Phil Hughes Committed by Douglas Barbosa Alexandre

Fixed weird gl dropdown error... 🙈

parent b9a52cb6
/* global BoardService */
/* global Vue */ /* global Vue */
module.exports = Vue.extend({ module.exports = Vue.extend({
props: { props: {
......
...@@ -534,9 +534,13 @@ ...@@ -534,9 +534,13 @@
GitLabDropdown.prototype.renderItem = function(data, group, index) { GitLabDropdown.prototype.renderItem = function(data, group, index) {
var field, fieldName, html, selected, text, url, value, rowHidden; var field, fieldName, html, selected, text, url, value, rowHidden;
if (!this.options.renderRow) {
value = this.options.id ? this.options.id(data) : data.id; value = this.options.id ? this.options.id(data) : data.id;
if (value) { value = value.toString().replace(/'/g, '\\\''); } if (value) {
value = value.toString().replace(/'/g, '\\\'');
}
}
// Hide element // Hide element
if (this.options.hideRow && this.options.hideRow(value)) { if (this.options.hideRow && this.options.hideRow(value)) {
......
/* global Vue */ /* global Vue */
/* global boardsMockInterceptor */ /* global boardsMockInterceptor */
/* global boardObj */
/* global BoardService */ /* global BoardService */
const MilestoneComp = require('~/boards/components/milestone_select'); const MilestoneComp = require('~/boards/components/milestone_select');
require('~/boards/services/board_service'); require('~/boards/services/board_service');
...@@ -59,7 +60,7 @@ describe('Milestone select component', () => { ...@@ -59,7 +60,7 @@ describe('Milestone select component', () => {
expect(vm.$el.querySelector('.fa-spinner')).toBeNull(); expect(vm.$el.querySelector('.fa-spinner')).toBeNull();
expect(vm.$el.querySelectorAll('.board-milestone-list li').length).toBe(3); expect(vm.$el.querySelectorAll('.board-milestone-list li').length).toBe(3);
expect( expect(
vm.$el.querySelectorAll('.board-milestone-list li')[2].textContent vm.$el.querySelectorAll('.board-milestone-list li')[2].textContent,
).toContain('test'); ).toContain('test');
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment