Merge branch 'issue-boards-dragging-fix' into 'master'
Fixed dragging issues on issue boards ## What does this MR do? This fixes a few issues all at once: - Fixes an issue when dragging an issue to a list but actually removes another issue from the original list - Fixes an issue that caused the issue card to be appended to the bottom of the list - Fixes an issue when dragging an issue would actually open up the sidebar ## What are the relevant issue numbers? Closes #24654 See merge request !7701
This commit is contained in:
commit
00162d24d9
5 changed files with 11 additions and 5 deletions
|
@ -54,6 +54,9 @@
|
||||||
mouseDown () {
|
mouseDown () {
|
||||||
this.showDetail = true;
|
this.showDetail = true;
|
||||||
},
|
},
|
||||||
|
mouseMove() {
|
||||||
|
this.showDetail = false;
|
||||||
|
},
|
||||||
showIssue (e) {
|
showIssue (e) {
|
||||||
const targetTagName = e.target.tagName.toLowerCase();
|
const targetTagName = e.target.tagName.toLowerCase();
|
||||||
|
|
||||||
|
|
|
@ -94,12 +94,10 @@
|
||||||
gl.issueBoards.onStart();
|
gl.issueBoards.onStart();
|
||||||
},
|
},
|
||||||
onAdd: (e) => {
|
onAdd: (e) => {
|
||||||
// Add the element back to original list to allow Vue to handle DOM updates
|
gl.issueBoards.BoardsStore.moveIssueToList(Store.moving.list, this.list, Store.moving.issue);
|
||||||
e.from.appendChild(e.item);
|
|
||||||
|
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
// Update the issues once we know the element has been moved
|
e.item.remove();
|
||||||
gl.issueBoards.BoardsStore.moveIssueToList(Store.moving.list, this.list, Store.moving.issue);
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
":issue" => "issue",
|
":issue" => "issue",
|
||||||
":issue-link-base" => "issueLinkBase",
|
":issue-link-base" => "issueLinkBase",
|
||||||
":disabled" => "disabled",
|
":disabled" => "disabled",
|
||||||
"key" => "id" }
|
":key" => "issue.id" }
|
||||||
%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" )
|
||||||
%span{ "v-if" => "list.issues.length === list.issuesSize" }
|
%span{ "v-if" => "list.issues.length === list.issuesSize" }
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
%li.card{ ":class" => '{ "user-can-drag": !disabled && issue.id, "is-disabled": disabled || !issue.id, "is-active": issueDetailVisible }',
|
%li.card{ ":class" => '{ "user-can-drag": !disabled && issue.id, "is-disabled": disabled || !issue.id, "is-active": issueDetailVisible }',
|
||||||
":index" => "index",
|
":index" => "index",
|
||||||
"@mousedown" => "mouseDown",
|
"@mousedown" => "mouseDown",
|
||||||
|
"@mousemove" => "mouseMove",
|
||||||
"@mouseup" => "showIssue($event)" }
|
"@mouseup" => "showIssue($event)" }
|
||||||
%h4.card-title
|
%h4.card-title
|
||||||
= icon("eye-slash", class: "confidential-icon", "v-if" => "issue.confidential")
|
= icon("eye-slash", class: "confidential-icon", "v-if" => "issue.confidential")
|
||||||
|
|
4
changelogs/unreleased/issue-boards-dragging-fix.yml
Normal file
4
changelogs/unreleased/issue-boards-dragging-fix.yml
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
title: Fixed issue boards dragging card removing random issues
|
||||||
|
merge_request:
|
||||||
|
author:
|
Loading…
Reference in a new issue