Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
934eaee9
Commit
934eaee9
authored
Nov 23, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed dragging issues on issue boards
Closes #24654
parent
d7eeb6df
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
5 deletions
+11
-5
app/assets/javascripts/boards/components/board_card.js.es6
app/assets/javascripts/boards/components/board_card.js.es6
+3
-0
app/assets/javascripts/boards/components/board_list.js.es6
app/assets/javascripts/boards/components/board_list.js.es6
+2
-4
app/views/projects/boards/components/_board_list.html.haml
app/views/projects/boards/components/_board_list.html.haml
+1
-1
app/views/projects/boards/components/_card.html.haml
app/views/projects/boards/components/_card.html.haml
+1
-0
changelogs/unreleased/issue-boards-dragging-fix.yml
changelogs/unreleased/issue-boards-dragging-fix.yml
+4
-0
No files found.
app/assets/javascripts/boards/components/board_card.js.es6
View file @
934eaee9
...
@@ -54,6 +54,9 @@
...
@@ -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();
...
...
app/assets/javascripts/boards/components/board_list.js.es6
View file @
934eaee9
...
@@ -94,12 +94,10 @@
...
@@ -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);
});
});
},
},
});
});
...
...
app/views/projects/boards/components/_board_list.html.haml
View file @
934eaee9
...
@@ -35,7 +35,7 @@
...
@@ -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"
}
...
...
app/views/projects/boards/components/_card.html.haml
View file @
934eaee9
%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"
)
...
...
changelogs/unreleased/issue-boards-dragging-fix.yml
0 → 100644
View file @
934eaee9
---
title
:
Fixed issue boards dragging card removing random issues
merge_request
:
author
:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment