Commit a9c98be0 authored by Phil Hughes's avatar Phil Hughes

Moved form outside of list

This was causing issues with moving from the done list
parent 674844d0
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
disabled: this.disabled, disabled: this.disabled,
filter: '.board-list-count, .board-new-issue-form', filter: '.board-list-count, .board-new-issue-form',
onStart: (e) => { onStart: (e) => {
const card = this.$refs.issue[e.oldIndex - 1]; const card = this.$refs.issue[e.oldIndex];
Store.moving.issue = card.issue; Store.moving.issue = card.issue;
Store.moving.list = card.list; Store.moving.list = card.list;
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
gl.issueBoards.BoardsStore.moveIssueToList(Store.moving.list, this.list, Store.moving.issue); gl.issueBoards.BoardsStore.moveIssueToList(Store.moving.list, this.list, Store.moving.issue);
}, },
onRemove: (e) => { onRemove: (e) => {
this.$refs.issue[e.oldIndex - 1].$destroy(true); this.$refs.issue[e.oldIndex].$destroy(true);
} }
}); });
......
...@@ -162,6 +162,10 @@ lex ...@@ -162,6 +162,10 @@ lex
list-style: none; list-style: none;
overflow-y: scroll; overflow-y: scroll;
overflow-x: hidden; overflow-x: hidden;
&.is-smaller {
height: calc(100% - 185px);
}
} }
.board-list-loading { .board-list-loading {
...@@ -234,6 +238,10 @@ lex ...@@ -234,6 +238,10 @@ lex
} }
} }
.board-new-issue-form {
margin: 5px;
}
.board-issue-count-holder { .board-issue-count-holder {
margin-top: -3px; margin-top: -3px;
...@@ -251,7 +259,7 @@ lex ...@@ -251,7 +259,7 @@ lex
border-radius: $border-radius-base; border-radius: $border-radius-base;
border-color: $border-color; border-color: $border-color;
border-style: solid; border-style: solid;
border-width: 1px 1px 1px 1px; border-width: 1px;
&.has-btn { &.has-btn {
border-top-right-radius: 0; border-top-right-radius: 0;
......
...@@ -37,28 +37,29 @@ ...@@ -37,28 +37,29 @@
":issue-link-base" => "issueLinkBase" } ":issue-link-base" => "issueLinkBase" }
.board-list-loading.text-center{ "v-if" => "loading" } .board-list-loading.text-center{ "v-if" => "loading" }
= icon("spinner spin") = icon("spinner spin")
- if can? current_user, :create_issue, @project
%board-new-issue{ "inline-template" => true,
":list" => "list",
":show-issue-form.sync" => "showIssueForm",
"v-show" => "list.type !== 'done' && showIssueForm" }
.card.board-new-issue-form
%form{ "@submit" => "submit($event)" }
%label.label-light
Title
%input.form-control{ type: "text",
"v-model" => "title",
"v-el:input" => true }
.clearfix.prepend-top-10
%button.btn.btn-success.pull-left{ type: "submit",
":disabled" => "title === ''" }
Submit issue
%button.btn.btn-default.pull-right{ type: "button",
"@click" => "cancel" }
Cancel
%ul.board-list{ "v-el:list" => true, %ul.board-list{ "v-el:list" => true,
"v-show" => "!loading", "v-show" => "!loading",
":data-board" => "list.id" } ":data-board" => "list.id",
- if can? current_user, :create_issue, @project ":class" => "{ 'is-smaller': showIssueForm }" }
%board-new-issue{ "inline-template" => true,
":list" => "list",
":show-issue-form.sync" => "showIssueForm",
"v-show" => "list.type !== 'done' && showIssueForm" }
%li.card.board-new-issue-form
%form{ "@submit" => "submit($event)" }
%label.label-light
Title
%input.form-control{ type: "text",
"v-model" => "title",
"v-el:input" => true }
.clearfix.prepend-top-10
%button.btn.btn-success.pull-left{ type: "submit",
":disabled" => "title === ''" }
Submit issue
%button.btn.btn-default.pull-right{ type: "button",
"@click" => "cancel" }
Cancel
= render "projects/boards/components/card" = render "projects/boards/components/card"
%li.board-list-count.text-center{ "v-if" => "showCount" } %li.board-list-count.text-center{ "v-if" => "showCount" }
= icon("spinner spin", "v-show" => "list.loadingMore" ) = icon("spinner spin", "v-show" => "list.loadingMore" )
......
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