diff options
author | Phil Hughes <me@iamphill.com> | 2019-04-16 10:03:36 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-04-16 10:03:36 +0000 |
commit | fae9fefe2f21497e210b09a38ff7f78de8d9bac1 (patch) | |
tree | 9dc9bc91ba9f3fe60f4bcfc2907b61f821aa0e64 | |
parent | a67b1c17a1284daf6e7f12d3f9c4a80fae59dde9 (diff) | |
parent | b2697cc77f94d14633bf66ecf82d565a093a448b (diff) | |
download | gitlab-ce-fae9fefe2f21497e210b09a38ff7f78de8d9bac1.tar.gz |
Merge branch 'winh-boards-store' into 'master'
Remove EE-specific code from boards store (CE-backport)
See merge request gitlab-org/gitlab-ce!26924
-rw-r--r-- | app/assets/javascripts/boards/stores/boards_store.js | 15 | ||||
-rw-r--r-- | app/assets/javascripts/boards/stores/boards_store_ee.js | 5 |
2 files changed, 19 insertions, 1 deletions
diff --git a/app/assets/javascripts/boards/stores/boards_store.js b/app/assets/javascripts/boards/stores/boards_store.js index 6b1e37d3f24..a34222b6887 100644 --- a/app/assets/javascripts/boards/stores/boards_store.js +++ b/app/assets/javascripts/boards/stores/boards_store.js @@ -5,6 +5,7 @@ import $ from 'jquery'; import _ from 'underscore'; import Vue from 'vue'; import Cookies from 'js-cookie'; +import BoardsStoreEE from 'ee_else_ce/boards/stores/boards_store_ee'; import { getUrlParamsArray, parseBoolean } from '~/lib/utils/common_utils'; const boardsStore = { @@ -16,7 +17,13 @@ const boardsStore = { filter: { path: '', }, - state: {}, + state: { + currentBoard: { + labels: [], + }, + currentPage: '', + reload: false, + }, detail: { issue: {}, }, @@ -31,6 +38,10 @@ const boardsStore = { issue: {}, }; }, + showPage(page) { + this.state.reload = false; + this.state.currentPage = page; + }, addList(listObj, defaultAvatar) { const list = new List(listObj, defaultAvatar); this.state.lists.push(list); @@ -178,6 +189,8 @@ const boardsStore = { }, }; +BoardsStoreEE.initEESpecific(boardsStore); + // hacks added in order to allow milestone_select to function properly // TODO: remove these diff --git a/app/assets/javascripts/boards/stores/boards_store_ee.js b/app/assets/javascripts/boards/stores/boards_store_ee.js new file mode 100644 index 00000000000..09e3a938fbe --- /dev/null +++ b/app/assets/javascripts/boards/stores/boards_store_ee.js @@ -0,0 +1,5 @@ +// 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() {}, +}; |