From 9654b098c6478e7c17bc8c848f9284daa26ead76 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 5 Jun 2014 09:29:24 +0300
Subject: [PATCH] Milestone drag-n-drop with 3 columns
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
app/assets/javascripts/milestone.js.coffee | 7 ++++---
app/views/projects/milestones/show.html.haml | 12 +++++-------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/app/assets/javascripts/milestone.js.coffee b/app/assets/javascripts/milestone.js.coffee
index bbbaa288b89..d2857948cd7 100644
--- a/app/assets/javascripts/milestone.js.coffee
+++ b/app/assets/javascripts/milestone.js.coffee
@@ -15,7 +15,7 @@ class Milestone
@bindSorting()
bindSorting: ->
- $("#issues-list-unassigned, #issues-list-ongoing, #issues-list-closed, #issues-list-reopened").sortable(
+ $("#issues-list-unassigned, #issues-list-ongoing, #issues-list-closed").sortable(
connectWith: ".issues-sortable-list",
dropOnEmpty: true,
receive: (event, ui) ->
@@ -30,8 +30,9 @@ class Milestone
"issue[assignee_id]="
when 'closed'
"issue[state_event]=close"
- when 'reopened'
- "issue[state_event]=reopen"
+
+ if $(ui.sender).data('state') == "closed"
+ data += "&issue[state_event]=reopen"
Milestone.updateIssue(ui.item, issue_url, data)
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml
index 594b6a0c72f..67b45fc30ba 100644
--- a/app/views/projects/milestones/show.html.haml
+++ b/app/views/projects/milestones/show.html.haml
@@ -75,14 +75,12 @@
.tab-content
.tab-pane.active#tab-issues
.row
- .col-md-3
- = render('issues', title: 'Unstarted Issues (open and unassigned)', issues: @issues.only_opened.unassigned, id: 'unassigned')
- .col-md-3
- = render('issues', title: 'Ongoing Issues (open and assigned)', issues: @issues.only_opened.assigned, id: 'ongoing')
- .col-md-3
+ .col-md-4
+ = render('issues', title: 'Unstarted Issues (open and unassigned)', issues: @issues.opened.unassigned, id: 'unassigned')
+ .col-md-4
+ = render('issues', title: 'Ongoing Issues (open and assigned)', issues: @issues.opened.assigned, id: 'ongoing')
+ .col-md-4
= render('issues', title: 'Completed Issues (closed)', issues: @issues.closed, id: 'closed')
- .col-md-3
- = render('issues', title: 'Reopened Issues (reopened)', issues: @issues.only_reopened, id: 'reopened')
.tab-pane#tab-merge-requests
.row
--
GitLab