taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor: Use tgNavUrls to get urls of the previous and next object

stable
David Barragán Merino 2014-08-23 22:59:18 +02:00
parent cc57fe6613
commit 5da5aa1dc0
3 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/coffee/modules/issues/detail.coffee
View File

@ -44,10 +44,11 @@ class IssueDetailController extends mixOf(taiga.Controller, taiga.PageMixin, tai
"$q", "$q",
"$location", "$location",
"$log", "$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" @.attachmentsUrlName = "issues/attachments"
@scope.issueRef = @params.issueref @scope.issueRef = @params.issueref
@ -85,12 +86,19 @@ class IssueDetailController extends mixOf(taiga.Controller, taiga.PageMixin, tai
@scope.issue = issue @scope.issue = issue
@scope.commentModel = issue @scope.commentModel = issue
projSlug = @scope.project.slug if @scope.issue.neighbors.previous.ref?
prev = @scope.issue.neighbors.previous ctx = {
next = @scope.issue.neighbors.next 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? if @scope.issue.neighbors.next.ref?
@scope.nextUrl = "/project/#{projSlug}/issue/#{next.ref}" if next.id? ctx = {
project: @scope.project.slug
ref: @scope.issue.neighbors.next.ref
}
@scope.nextUrl = @navUrls.resolve("project-issues-detail", ctx)
loadHistory: => loadHistory: =>
return @rs.issues.history(@scope.issueId).then (history) => return @rs.issues.history(@scope.issueId).then (history) =>

22
app/coffee/modules/tasks/detail.coffee
View File

@ -41,10 +41,11 @@ class TaskDetailController extends mixOf(taiga.Controller, taiga.PageMixin, taig
"$q", "$q",
"$location", "$location",
"$log", "$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" @.attachmentsUrlName = "tasks/attachments"
@scope.taskRef = @params.taskref @scope.taskRef = @params.taskref
@ -76,12 +77,19 @@ class TaskDetailController extends mixOf(taiga.Controller, taiga.PageMixin, taig
@scope.task = task @scope.task = task
@scope.commentModel = task @scope.commentModel = task
projSlug = @scope.project.slug if @scope.task.neighbors.previous.ref?
prev = @scope.task.neighbors.previous ctx = {
next = @scope.task.neighbors.next 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? if @scope.task.neighbors.next.ref?
@scope.nextUrl = "/project/#{projSlug}/task/#{next.ref}" if next.id? ctx = {
project: @scope.project.slug
ref: @scope.task.neighbors.next.ref
}
@scope.nextUrl = @navUrls.resolve("project-tasks-detail", ctx)
loadHistory: => loadHistory: =>
return @rs.tasks.history(@scope.taskId).then (history) => return @rs.tasks.history(@scope.taskId).then (history) =>

22
app/coffee/modules/userstories/detail.coffee
View File

@ -42,10 +42,11 @@ class UserStoryDetailController extends mixOf(taiga.Controller, taiga.PageMixin,
"$q", "$q",
"$location", "$location",
"$log", "$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" @.attachmentsUrlName = "userstories/attachments"
@scope.issueRef = @params.issueref @scope.issueRef = @params.issueref
@ -80,12 +81,19 @@ class UserStoryDetailController extends mixOf(taiga.Controller, taiga.PageMixin,
@scope.us = us @scope.us = us
@scope.commentModel = us @scope.commentModel = us
projSlug = @scope.project.slug if @scope.us.neighbors.previous.ref?
prev = @scope.us.neighbors.previous ctx = {
next = @scope.us.neighbors.next 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? if @scope.us.neighbors.next.ref?
@scope.nextUrl = "/project/#{projSlug}/us/#{next.ref}" if next.id? ctx = {
project: @scope.project.slug
ref: @scope.us.neighbors.next.ref
}
@scope.nextUrl = @navUrls.resolve("project-userstories-detail", ctx)
loadTasks: -> loadTasks: ->
return @rs.tasks.list(@scope.projectId, null, @scope.usId).then (tasks) => return @rs.tasks.list(@scope.projectId, null, @scope.usId).then (tasks) =>