From 2df1a868c9406cfe9b26c72658fb28aad46ae6ba Mon Sep 17 00:00:00 2001
From: Juanfran <juanfran.alcantara@kaleidos.net>
Date: Thu, 16 Mar 2017 09:20:02 +0100
Subject: [PATCH] [backport] fix #5006 - fix drag multiple us to sprint

---
 app/coffee/modules/backlog/main.coffee          |  2 ++
 app/coffee/modules/resources/userstories.coffee | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/coffee/modules/backlog/main.coffee b/app/coffee/modules/backlog/main.coffee
index 78576f4c..1a758db7 100644
--- a/app/coffee/modules/backlog/main.coffee
+++ b/app/coffee/modules/backlog/main.coffee
@@ -408,6 +408,7 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F
                 afterDestination = _.slice(@scope.userstories, newUsIndex)
 
                 @scope.userstories = @scope.userstories.concat(usList)
+
             else # From backlog to sprint
                 for us in usList # delete from sprint userstories
                     _.remove @scope.userstories, (it) -> it.id == us.id
@@ -479,6 +480,7 @@ class BacklogController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.F
 
         # refresh order
         @scope.userstories = _.sortBy @scope.userstories, (it) => @.backlogOrder[it.id]
+        @scope.visibleUserStories = _.map @scope.userstories, (it) -> return it.ref
 
         for sprint in @scope.sprints
             sprint.user_stories = _.sortBy sprint.user_stories, (it) => @.milestonesOrder[sprint.id][it.id]
diff --git a/app/coffee/modules/resources/userstories.coffee b/app/coffee/modules/resources/userstories.coffee
index a541c739..4d28b529 100644
--- a/app/coffee/modules/resources/userstories.coffee
+++ b/app/coffee/modules/resources/userstories.coffee
@@ -102,16 +102,22 @@ resourceProvider = ($repo, $http, $urls, $storage, $q) ->
         params = {project_id: projectId, bulk_stories: data}
         return $http.post(url, params)
 
-    service.bulkUpdateMilestone = (projectId, milestoneId, data) ->
-        url = $urls.resolve("bulk-update-us-milestone")
-        params = {project_id: projectId, milestone_id: milestoneId, bulk_stories: data}
-        return $http.post(url, params)
-
     service.bulkUpdateKanbanOrder = (projectId, data) ->
         url = $urls.resolve("bulk-update-us-kanban-order")
         params = {project_id: projectId, bulk_stories: data}
         return $http.post(url, params)
 
+    service.bulkUpdateMilestone = (projectId, milestoneId, data) ->
+        url = $urls.resolve("bulk-update-us-milestone")
+        data = _.map data, (us) ->
+            return {
+                us_id: us.id || us.us_id
+                order: us.order
+            }
+
+        params = {project_id: projectId, milestone_id: milestoneId, bulk_stories: data}
+        return $http.post(url, params)
+
     service.listValues = (projectId, type) ->
         params = {"project": projectId}
         service.storeQueryParams(projectId, params)