diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-11-23 17:34:02 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-23 17:34:02 +0000 |
commit | 00162d24d909a127656eae9393b01b36c23d4254 (patch) | |
tree | c49966aa98f866454ff341f3acaa6ed738937322 /app/views/projects | |
parent | c52f3d1ca0fede064e6b886af0297d1ae8f9f18b (diff) | |
parent | 934eaee94e0a16b4f76a19521a13ce86fdea8d9c (diff) | |
download | gitlab-ce-00162d24d909a127656eae9393b01b36c23d4254.tar.gz |
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
Diffstat (limited to 'app/views/projects')
-rw-r--r-- | app/views/projects/boards/components/_board_list.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/boards/components/_card.html.haml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/views/projects/boards/components/_board_list.html.haml b/app/views/projects/boards/components/_board_list.html.haml index d86e0ed8540..34fdb1f6a74 100644 --- a/app/views/projects/boards/components/_board_list.html.haml +++ b/app/views/projects/boards/components/_board_list.html.haml @@ -35,7 +35,7 @@ ":issue" => "issue", ":issue-link-base" => "issueLinkBase", ":disabled" => "disabled", - "key" => "id" } + ":key" => "issue.id" } %li.board-list-count.text-center{ "v-if" => "showCount" } = icon("spinner spin", "v-show" => "list.loadingMore" ) %span{ "v-if" => "list.issues.length === list.issuesSize" } diff --git a/app/views/projects/boards/components/_card.html.haml b/app/views/projects/boards/components/_card.html.haml index 72b31b8cdae..34effac17b2 100644 --- a/app/views/projects/boards/components/_card.html.haml +++ b/app/views/projects/boards/components/_card.html.haml @@ -1,6 +1,7 @@ %li.card{ ":class" => '{ "user-can-drag": !disabled && issue.id, "is-disabled": disabled || !issue.id, "is-active": issueDetailVisible }', ":index" => "index", "@mousedown" => "mouseDown", + "@mousemove" => "mouseMove", "@mouseup" => "showIssue($event)" } %h4.card-title = icon("eye-slash", class: "confidential-icon", "v-if" => "issue.confidential") |