Fix #754: Use slug in taskboards urls instead milestone id
parent
023a8e2a3c
commit
dcdd9d8d8f
|
@ -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})
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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, =>
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue