CE backport of issue-boards-js-fix
This commit is contained in:
parent
3f14c56bfe
commit
2f8b9931bc
|
@ -1,5 +1,3 @@
|
|||
/* eslint-disable quote-props, comma-dangle */
|
||||
|
||||
import $ from 'jquery';
|
||||
import _ from 'underscore';
|
||||
import Vue from 'vue';
|
||||
|
@ -47,7 +45,7 @@ export default () => {
|
|||
gl.IssueBoardsApp = new Vue({
|
||||
el: $boardApp,
|
||||
components: {
|
||||
'board': gl.issueBoards.Board,
|
||||
board: gl.issueBoards.Board,
|
||||
'board-sidebar': gl.issueBoards.BoardSidebar,
|
||||
BoardAddIssuesModal,
|
||||
},
|
||||
|
@ -94,10 +92,11 @@ export default () => {
|
|||
this.filterManager.setup();
|
||||
|
||||
Store.disabled = this.disabled;
|
||||
gl.boardService.all()
|
||||
gl.boardService
|
||||
.all()
|
||||
.then(res => res.data)
|
||||
.then((data) => {
|
||||
data.forEach((board) => {
|
||||
.then(data => {
|
||||
data.forEach(board => {
|
||||
const list = Store.addList(board, this.defaultAvatar);
|
||||
|
||||
if (list.type === 'closed') {
|
||||
|
@ -126,7 +125,7 @@ export default () => {
|
|||
newIssue.setFetchingState('subscriptions', true);
|
||||
BoardService.getIssueInfo(sidebarInfoEndpoint)
|
||||
.then(res => res.data)
|
||||
.then((data) => {
|
||||
.then(data => {
|
||||
newIssue.setFetchingState('subscriptions', false);
|
||||
newIssue.updateData({
|
||||
subscribed: data.subscribed,
|
||||
|
@ -159,7 +158,7 @@ export default () => {
|
|||
Flash(__('An error occurred when toggling the notification subscription'));
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
|
@ -173,8 +172,11 @@ export default () => {
|
|||
},
|
||||
});
|
||||
|
||||
const issueBoardsModal = document.getElementById('js-add-issues-btn');
|
||||
|
||||
if (issueBoardsModal) {
|
||||
gl.IssueBoardsModalAddBtn = new Vue({
|
||||
el: document.getElementById('js-add-issues-btn'),
|
||||
el: issueBoardsModal,
|
||||
mixins: [modalMixin],
|
||||
data() {
|
||||
return {
|
||||
|
@ -241,4 +243,5 @@ export default () => {
|
|||
</div>
|
||||
`,
|
||||
});
|
||||
}
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue