From dcdd9d8d8f2687ac8d83a3791c51f2882e3ba364 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Fri, 29 Aug 2014 13:53:29 +0200
Subject: [PATCH] Fix #754: Use slug in taskboards urls instead milestone id

---
 app/coffee/app.coffee                     | 2 +-
 app/coffee/modules/base/repository.coffee | 2 +-
 app/coffee/modules/taskboard/main.coffee  | 9 +++++++--
 app/partials/views/modules/sprints.jade   | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/coffee/app.coffee b/app/coffee/app.coffee
index 52c5fafb..8fa21747 100644
--- a/app/coffee/app.coffee
+++ b/app/coffee/app.coffee
@@ -28,7 +28,7 @@ configure = ($routeProvider, $locationProvider, $httpProvider, $provide, tgLoade
         {templateUrl: "/partials/project.html"})
     $routeProvider.when("/project/:pslug/backlog",
         {templateUrl: "/partials/backlog.html", resolve: {loader: tgLoaderProvider.add()}})
-    $routeProvider.when("/project/:pslug/taskboard/:id",
+    $routeProvider.when("/project/:pslug/taskboard/:sslug",
         {templateUrl: "/partials/taskboard.html"})
     $routeProvider.when("/project/:pslug/search",
         {templateUrl: "/partials/search.html", reloadOnSearch: false})
diff --git a/app/coffee/modules/base/repository.coffee b/app/coffee/modules/base/repository.coffee
index 7f841e89..57eeaa4f 100644
--- a/app/coffee/modules/base/repository.coffee
+++ b/app/coffee/modules/base/repository.coffee
@@ -151,7 +151,7 @@ class RepositoryService extends taiga.Service
         params.us = options.usref if options.usref?
         params.task = options.taskref if options.taskref?
         params.issue = options.issueref if options.issueref?
-        params.milestone = options.mlref if options.mlref?
+        params.milestone = options.sslug if options.sslug?
         params.wikipage = options.wikipage if options.wikipage?
         return @.queryOneRaw("resolver", null, params)
 
diff --git a/app/coffee/modules/taskboard/main.coffee b/app/coffee/modules/taskboard/main.coffee
index 7c73c0e7..274b6081 100644
--- a/app/coffee/modules/taskboard/main.coffee
+++ b/app/coffee/modules/taskboard/main.coffee
@@ -49,7 +49,6 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin)
     constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @appTitle, @location) ->
         _.bindAll(@)
 
-        @scope.sprintId = @params.id
         @scope.sectionName = "Taskboard"
 
         promise = @.loadInitialData()
@@ -139,8 +138,14 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin)
         ]).then(=> @.loadTasks())
 
     loadInitialData: ->
-        promise = @repo.resolve({pslug: @params.pslug}).then (data) =>
+        params = {
+            pslug: @params.pslug
+            sslug: @params.sslug
+        }
+
+        promise = @repo.resolve(params).then (data) =>
             @scope.projectId = data.project
+            @scope.sprintId = data.milestone
             return data
 
         promise.then null, =>
diff --git a/app/partials/views/modules/sprints.jade b/app/partials/views/modules/sprints.jade
index bb202b11..03e9dbc1 100644
--- a/app/partials/views/modules/sprints.jade
+++ b/app/partials/views/modules/sprints.jade
@@ -35,5 +35,5 @@ section.sprints
                         span(tg-bo-bind="us.subject")
                 div.column-points.width-1(tg-bo-bind="us.total_points")
         a.button.button-gray(tg-check-permission, permission="view_milestones", title="Current Sprint Taskboard"
-                             href="", tg-nav="project-taskboard:project=project.slug,sprint=sprint.id")
+                             href="", tg-nav="project-taskboard:project=project.slug,sprint=sprint.slug")
             span Sprint Taskboard