Show active attachments of tasks
parent
898b040246
commit
d00ea43289
|
@ -30,7 +30,7 @@ module = angular.module("taigaTasks")
|
|||
## Task Detail Controller
|
||||
#############################################################################
|
||||
|
||||
class TaskDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
|
||||
class TaskDetailController extends mixOf(taiga.Controller, taiga.PageMixin, taiga.AttachmentsMixin)
|
||||
@.$inject = [
|
||||
"$scope",
|
||||
"$rootScope",
|
||||
|
@ -39,10 +39,13 @@ class TaskDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
|
|||
"$tgResources",
|
||||
"$routeParams",
|
||||
"$q",
|
||||
"$location"
|
||||
"$location",
|
||||
"$log"
|
||||
]
|
||||
|
||||
constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location) ->
|
||||
constructor: (@scope, @rootscope, @repo, @confirm, @rs, @params, @q, @location, @log) ->
|
||||
@.attachmentsUrlName = "tasks/attachments"
|
||||
|
||||
@scope.taskRef = @params.taskref
|
||||
@scope.sectionName = "Task Details"
|
||||
|
||||
|
@ -95,6 +98,7 @@ class TaskDetailController extends mixOf(taiga.Controller, taiga.PageMixin)
|
|||
return promise.then(=> @.loadProject())
|
||||
.then(=> @.loadUsersAndRoles())
|
||||
.then(=> @.loadTask())
|
||||
.then(=> @.loadAttachments(@scope.taskId))
|
||||
.then(=> @.loadHistory())
|
||||
|
||||
getUserFullName: (userId) ->
|
||||
|
|
|
@ -26,7 +26,8 @@ block content
|
|||
section.us-content
|
||||
textarea(placeholder="Write a description of your task", ng-model="task.description", tg-markitup)
|
||||
|
||||
// include views/modules/attachments
|
||||
include views/modules/attachments
|
||||
|
||||
textarea(ng-model="task.comment", placeholder="Write here a new commet")
|
||||
|
||||
sidebar.menu-secondary.sidebar
|
||||
|
|
|
@ -29,7 +29,8 @@ block content
|
|||
|
||||
section.us-content.wysiwyg(tg-bind-html="task.description_html")
|
||||
|
||||
// include views/modules/attachments
|
||||
include views/modules/attachments
|
||||
|
||||
section.us-activity
|
||||
ul.us-activity-tabs
|
||||
li
|
||||
|
|
Loading…
Reference in New Issue