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

Fix tg-4674: Show edited comment history

stable
David Barragán Merino 2016-10-20 13:28:10 +02:00
parent 4e53c1e52f
commit 451b9f979c
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/modules/history/comments/comment.jade
View File

@ -15,7 +15,7 @@ include ../../../partials/common/components/wysiwyg.jade
span.separator -
a(
href=""
title="COMMENTS.SHOW_HISTORY"
title="{{'COMMENTS.SHOW_HISTORY' | translate}}"
ng-click="vm.displayCommentHistory()"
)
span(translate="COMMENTS.SHOW_HISTORY")
@ -74,6 +74,7 @@ include ../../../partials/common/components/wysiwyg.jade
span - {{vm.comment.delete_comment_date | momentFormat:'DD MMM YYYY HH:mm'}}
a.toggle-deleted-comment(
href=""
title="{{ 'COMMENTS.SHOW_DELETED' | translate }}"
ng-click="vm.showDeletedComment()"
ng-if="vm.hiddenDeletedComment"
)
@ -84,6 +85,7 @@ include ../../../partials/common/components/wysiwyg.jade
)
a.toggle-deleted-comment(
href=""
title="{{'COMMENTS.HIDE_DELETED' | translate}}"
ng-click="vm.hideDeletedComment()"
ng-if="!vm.hiddenDeletedComment"
)
@ -94,6 +96,7 @@ include ../../../partials/common/components/wysiwyg.jade
)
a.restore-comment(
href=""
title="{{'COMMENTS.RESTORE' | translate}}"
ng-click="vm.onRestoreDeletedComment({commentId: vm.comment.id})"
tg-loading="vm.editing == vm.comment.id"
)

8
app/modules/history/history-lightbox/comment-history-lightbox.directive.coffee
View File

@ -17,8 +17,6 @@
# File: comment.directive.coffee
###
module = angular.module('taigaHistory')
LightboxDisplayHistoricDirective = (lightboxService) ->
link = (scope, el, attrs, ctrl) ->
ctrl._loadHistoric()
@ -37,4 +35,8 @@ LightboxDisplayHistoricDirective = (lightboxService) ->
link: link
}
module.directive("tgLbDisplayHistoric", LightboxDisplayHistoricDirective)
LightboxDisplayHistoricDirective.$inject = [
"lightboxService"
]
angular.module('taigaHistory').directive("tgLbDisplayHistoric", LightboxDisplayHistoricDirective)