diff --git a/app/assets/javascripts/boards/components/board_list.js.es6 b/app/assets/javascripts/boards/components/board_list.js.es6 index 208aac504fd591e46f23391544e5d6c142383659..bc74a7b23c9939939c937d48d49bac09276cf144 100644 --- a/app/assets/javascripts/boards/components/board_list.js.es6 +++ b/app/assets/javascripts/boards/components/board_list.js.es6 @@ -78,7 +78,7 @@ disabled: this.disabled, filter: '.board-list-count, .board-new-issue-form', onStart: (e) => { - const card = this.$refs.issue[e.oldIndex]; + const card = this.$refs.issue[e.oldIndex - 1]; Store.moving.issue = card.issue; Store.moving.list = card.list; @@ -89,7 +89,7 @@ gl.issueBoards.BoardsStore.moveIssueToList(Store.moving.list, this.list, Store.moving.issue); }, onRemove: (e) => { - this.$refs.issue[e.oldIndex].$destroy(true); + this.$refs.issue[e.oldIndex - 1].$destroy(true); } }); diff --git a/app/assets/javascripts/boards/components/board_new_issue.js.es6 b/app/assets/javascripts/boards/components/board_new_issue.js.es6 index 60c13afefeb0b3a8342994db05d52591172d1f81..eb26ed9721dba5f702a596d379d16f51279441f3 100644 --- a/app/assets/javascripts/boards/components/board_new_issue.js.es6 +++ b/app/assets/javascripts/boards/components/board_new_issue.js.es6 @@ -19,9 +19,10 @@ methods: { submit(e) { e.preventDefault(); + const labels = this.list.label ? [this.list.label] : []; const issue = new ListIssue({ title: this.title, - labels: [this.list.label] + labels }); this.list.newIssue(issue); diff --git a/app/controllers/projects/boards/issues_controller.rb b/app/controllers/projects/boards/issues_controller.rb index 41794193784fa533accaa87f39865cda406838d9..3b1b236a89a01f5b0d7f9850f7d4d7ba29974786 100644 --- a/app/controllers/projects/boards/issues_controller.rb +++ b/app/controllers/projects/boards/issues_controller.rb @@ -23,7 +23,7 @@ module Projects list = project.board.lists.find(params[:list_id]) issue = Issues::CreateService.new(project, current_user, issue_params.merge(request: request)).execute - issue.labels << list.label + issue.labels << list.label if list.label render json: issue.to_json end diff --git a/app/views/projects/boards/components/_card.html.haml b/app/views/projects/boards/components/_card.html.haml index e8b60b54d8028bb3e7078618caad2d5d709346be..25701b0a99e2b55b42ba1c5504e9fc9f98761c8b 100644 --- a/app/views/projects/boards/components/_card.html.haml +++ b/app/views/projects/boards/components/_card.html.haml @@ -15,7 +15,7 @@ ":title" => "issue.title" } {{ issue.title }} .card-footer - %span.card-number + %span.card-number{ "v-if" => "issue.id" } = precede '#' do {{ issue.id }} %button.label.color-label.has-tooltip{ "v-for" => "label in issue.labels",