diff options
| author | Phil Hughes <me@iamphill.com> | 2016-10-19 08:44:55 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-10-19 08:44:55 +0100 |
| commit | f1350a5c825610f908ed7182855af436fe4957dd (patch) | |
| tree | f72b471c2abc99b37ee30f716363d8a29b75fe77 /app/assets/javascripts/boards | |
| parent | e4176f4ec42fa8e391b088d62deef051cdafaf23 (diff) | |
| parent | f64e36c44832db125beab5923c0177ff69ccedba (diff) | |
| download | gitlab-ce-f1350a5c825610f908ed7182855af436fe4957dd.tar.gz | |
Merge branch 'master' into issue-board-sidebar
Diffstat (limited to 'app/assets/javascripts/boards')
3 files changed, 8 insertions, 7 deletions
diff --git a/app/assets/javascripts/boards/boards_bundle.js.es6 b/app/assets/javascripts/boards/boards_bundle.js.es6 index c5dd51c39d7..0cecdc4f50a 100644 --- a/app/assets/javascripts/boards/boards_bundle.js.es6 +++ b/app/assets/javascripts/boards/boards_bundle.js.es6 @@ -31,12 +31,13 @@ $(() => { state: Store.state, loading: true, endpoint: $boardApp.dataset.endpoint, + boardId: $boardApp.dataset.boardId, disabled: $boardApp.dataset.disabled === 'true', issueLinkBase: $boardApp.dataset.issueLinkBase }, init: Store.create.bind(Store), created () { - gl.boardService = new BoardService(this.endpoint); + gl.boardService = new BoardService(this.endpoint, this.boardId); }, ready () { Store.disabled = this.disabled; diff --git a/app/assets/javascripts/boards/components/board_sidebar.js.es6 b/app/assets/javascripts/boards/components/board_sidebar.js.es6 index 8d217f0f573..1c002a54bed 100644 --- a/app/assets/javascripts/boards/components/board_sidebar.js.es6 +++ b/app/assets/javascripts/boards/components/board_sidebar.js.es6 @@ -31,7 +31,7 @@ this.$nextTick(() => { new IssuableContext(this.currentUser); new MilestoneSelect(); - new DueDateSelect(); + new gl.DueDateSelectors(); new LabelsSelect(); new Sidebar(); new Subscription('.subscription'); diff --git a/app/assets/javascripts/boards/services/board_service.js.es6 b/app/assets/javascripts/boards/services/board_service.js.es6 index b7a9ea16204..b76063911bb 100644 --- a/app/assets/javascripts/boards/services/board_service.js.es6 +++ b/app/assets/javascripts/boards/services/board_service.js.es6 @@ -1,13 +1,13 @@ class BoardService { - constructor (root) { - this.lists = Vue.resource(`${root}/lists{/id}`, {}, { + constructor (root, boardId) { + this.lists = Vue.resource(`${root}/${boardId}/lists{/id}`, {}, { generate: { method: 'POST', - url: `${root}/lists/generate.json` + url: `${root}/${boardId}/lists/generate.json` } }); - this.issue = Vue.resource(`${root}/issues{/id}`, {}); - this.issues = Vue.resource(`${root}/lists{/id}/issues`, {}); + this.issue = Vue.resource(`${root}/${boardId}/issues{/id}`, {}); + this.issues = Vue.resource(`${root}/${boardId}/lists{/id}/issues`, {}); Vue.http.interceptors.push((request, next) => { request.headers['X-CSRF-Token'] = $.rails.csrfToken(); |