Commit fae9fefe authored by Phil Hughes's avatar Phil Hughes

Merge branch 'winh-boards-store' into 'master'

Remove EE-specific code from boards store (CE-backport)

See merge request gitlab-org/gitlab-ce!26924
parents a67b1c17 b2697cc7
...@@ -5,6 +5,7 @@ import $ from 'jquery'; ...@@ -5,6 +5,7 @@ import $ from 'jquery';
import _ from 'underscore'; import _ from 'underscore';
import Vue from 'vue'; import Vue from 'vue';
import Cookies from 'js-cookie'; import Cookies from 'js-cookie';
import BoardsStoreEE from 'ee_else_ce/boards/stores/boards_store_ee';
import { getUrlParamsArray, parseBoolean } from '~/lib/utils/common_utils'; import { getUrlParamsArray, parseBoolean } from '~/lib/utils/common_utils';
const boardsStore = { const boardsStore = {
...@@ -16,7 +17,13 @@ const boardsStore = { ...@@ -16,7 +17,13 @@ const boardsStore = {
filter: { filter: {
path: '', path: '',
}, },
state: {}, state: {
currentBoard: {
labels: [],
},
currentPage: '',
reload: false,
},
detail: { detail: {
issue: {}, issue: {},
}, },
...@@ -31,6 +38,10 @@ const boardsStore = { ...@@ -31,6 +38,10 @@ const boardsStore = {
issue: {}, issue: {},
}; };
}, },
showPage(page) {
this.state.reload = false;
this.state.currentPage = page;
},
addList(listObj, defaultAvatar) { addList(listObj, defaultAvatar) {
const list = new List(listObj, defaultAvatar); const list = new List(listObj, defaultAvatar);
this.state.lists.push(list); this.state.lists.push(list);
...@@ -178,6 +189,8 @@ const boardsStore = { ...@@ -178,6 +189,8 @@ const boardsStore = {
}, },
}; };
BoardsStoreEE.initEESpecific(boardsStore);
// hacks added in order to allow milestone_select to function properly // hacks added in order to allow milestone_select to function properly
// TODO: remove these // TODO: remove these
......
// this is just to make ee_else_ce happy and will be cleaned up in https://gitlab.com/gitlab-org/gitlab-ce/issues/59807
export default {
initEESpecific() {},
};
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