diff --git a/app/coffee/modules/issues/detail.coffee b/app/coffee/modules/issues/detail.coffee index 03be5443..507b66fa 100644 --- a/app/coffee/modules/issues/detail.coffee +++ b/app/coffee/modules/issues/detail.coffee @@ -44,10 +44,11 @@ class IssueDetailController extends mixOf(taiga.Controller, taiga.PageMixin, tai "$q", "$location", "$log", - "$appTitle" + "$appTitle", + "$tgNavUrls" ] - constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @log, @appTitle) -> + constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @log, @appTitle, @navUrls) -> @.attachmentsUrlName = "issues/attachments" @scope.issueRef = @params.issueref @@ -85,12 +86,19 @@ class IssueDetailController extends mixOf(taiga.Controller, taiga.PageMixin, tai @scope.issue = issue @scope.commentModel = issue - projSlug = @scope.project.slug - prev = @scope.issue.neighbors.previous - next = @scope.issue.neighbors.next + if @scope.issue.neighbors.previous.ref? + ctx = { + project: @scope.project.slug + ref: @scope.issue.neighbors.previous.ref + } + @scope.previousUrl = @navUrls.resolve("project-issues-detail", ctx) - @scope.previousUrl = "/project/#{projSlug}/issue/#{prev.ref}" if prev.id? - @scope.nextUrl = "/project/#{projSlug}/issue/#{next.ref}" if next.id? + if @scope.issue.neighbors.next.ref? + ctx = { + project: @scope.project.slug + ref: @scope.issue.neighbors.next.ref + } + @scope.nextUrl = @navUrls.resolve("project-issues-detail", ctx) loadHistory: => return @rs.issues.history(@scope.issueId).then (history) => diff --git a/app/coffee/modules/tasks/detail.coffee b/app/coffee/modules/tasks/detail.coffee index 99373497..3fe06348 100644 --- a/app/coffee/modules/tasks/detail.coffee +++ b/app/coffee/modules/tasks/detail.coffee @@ -41,10 +41,11 @@ class TaskDetailController extends mixOf(taiga.Controller, taiga.PageMixin, taig "$q", "$location", "$log", - "$appTitle" + "$appTitle", + "$tgNavUrls" ] - constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @log, @appTitle) -> + constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @log, @appTitle, @navUrls) -> @.attachmentsUrlName = "tasks/attachments" @scope.taskRef = @params.taskref @@ -76,12 +77,19 @@ class TaskDetailController extends mixOf(taiga.Controller, taiga.PageMixin, taig @scope.task = task @scope.commentModel = task - projSlug = @scope.project.slug - prev = @scope.task.neighbors.previous - next = @scope.task.neighbors.next + if @scope.task.neighbors.previous.ref? + ctx = { + project: @scope.project.slug + ref: @scope.task.neighbors.previous.ref + } + @scope.previousUrl = @navUrls.resolve("project-tasks-detail", ctx) - @scope.previousUrl = "/project/#{projSlug}/task/#{prev.ref}" if prev.id? - @scope.nextUrl = "/project/#{projSlug}/task/#{next.ref}" if next.id? + if @scope.task.neighbors.next.ref? + ctx = { + project: @scope.project.slug + ref: @scope.task.neighbors.next.ref + } + @scope.nextUrl = @navUrls.resolve("project-tasks-detail", ctx) loadHistory: => return @rs.tasks.history(@scope.taskId).then (history) => diff --git a/app/coffee/modules/userstories/detail.coffee b/app/coffee/modules/userstories/detail.coffee index 0ec3552c..dad2c6ab 100644 --- a/app/coffee/modules/userstories/detail.coffee +++ b/app/coffee/modules/userstories/detail.coffee @@ -42,10 +42,11 @@ class UserStoryDetailController extends mixOf(taiga.Controller, taiga.PageMixin, "$q", "$location", "$log", - "$appTitle" + "$appTitle", + "$tgNavUrls" ] - constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @log, @appTitle) -> + constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @log, @appTitle, @navUrls) -> @.attachmentsUrlName = "userstories/attachments" @scope.issueRef = @params.issueref @@ -80,12 +81,19 @@ class UserStoryDetailController extends mixOf(taiga.Controller, taiga.PageMixin, @scope.us = us @scope.commentModel = us - projSlug = @scope.project.slug - prev = @scope.us.neighbors.previous - next = @scope.us.neighbors.next + if @scope.us.neighbors.previous.ref? + ctx = { + project: @scope.project.slug + ref: @scope.us.neighbors.previous.ref + } + @scope.previousUrl = @navUrls.resolve("project-userstories-detail", ctx) - @scope.previousUrl = "/project/#{projSlug}/us/#{prev.ref}" if prev.id? - @scope.nextUrl = "/project/#{projSlug}/us/#{next.ref}" if next.id? + if @scope.us.neighbors.next.ref? + ctx = { + project: @scope.project.slug + ref: @scope.us.neighbors.next.ref + } + @scope.nextUrl = @navUrls.resolve("project-userstories-detail", ctx) loadTasks: -> return @rs.tasks.list(@scope.projectId, null, @scope.usId).then (tasks) =>