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

Fixing watchers refresh

stable
Álex Hermida 2018-10-04 16:37:44 +02:00 committed by Alex Hermida
parent 360aa0c5ac
commit 4a8a59a771
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/modules/components/wysiwyg/comment-wysiwyg.directive.coffee
View File

@ -17,14 +17,18 @@
# File: components/wysiwyg/comment-wysiwyg.directive.coffee # File: components/wysiwyg/comment-wysiwyg.directive.coffee
### ###
CommentWysiwyg = (attachmentsFullService) -> CommentWysiwyg = ($modelTransform, $rootscope, $confirm, attachmentsFullService) ->
link = ($scope, $el, $attrs) -> link = ($scope, $el, $attrs) ->
$scope.editableDescription = false $scope.editableDescription = false
$scope.saveComment = (description, cb) -> $scope.saveComment = (description, cb) ->
$scope.content = '' $scope.content = ''
$scope.vm.type.comment = description $scope.vm.type.comment = description
$scope.vm.onAddComment({callback: cb})
transform = $modelTransform.save (item) -> return
transform.then ->
$rootscope.$broadcast("object:updated")
transform.finally(cb)
types = { types = {
epics: "epic", epics: "epic",
@ -70,4 +74,8 @@ CommentWysiwyg = (attachmentsFullService) ->
} }
angular.module("taigaComponents") angular.module("taigaComponents")
.directive("tgCommentWysiwyg", ["tgAttachmentsFullService", CommentWysiwyg]) .directive("tgCommentWysiwyg", [
"$tgQueueModelTransformation",
"$rootScope",
"tgAttachmentsFullService",
CommentWysiwyg])

1
app/modules/components/wysiwyg/item-wysiwyg.directive.coffee
View File

@ -21,7 +21,6 @@
ItemWysiwyg = ($modelTransform, $rootscope, $confirm, attachmentsFullService, $translate) -> ItemWysiwyg = ($modelTransform, $rootscope, $confirm, attachmentsFullService, $translate) ->
link = ($scope, $el, $attrs) -> link = ($scope, $el, $attrs) ->
$scope.editableDescription = false $scope.editableDescription = false
$scope.saveDescription = (description, cb) -> $scope.saveDescription = (description, cb) ->
transform = $modelTransform.save (item) -> transform = $modelTransform.save (item) ->
item.description = description item.description = description

2
app/modules/history/history.controller.coffee
View File

@ -94,7 +94,7 @@ class HistorySectionController
@.editing = null @.editing = null
addComment: (cb) -> addComment: (cb) ->
@repo.save(@.type).then => return @repo.save(@.type).then =>
@._loadHistory() @._loadHistory()
cb() cb()

6
app/modules/projects/create/import-taiga/import-taiga.controller.coffee
View File

@ -33,13 +33,13 @@ class ImportTaigaController
file = files[0] file = files[0]
loader = @confirm.loader(@translate.instant('PROJECT.IMPORT.IN_PROGRESS.TITLE'), @translate.instant('PROJECT.IMPORT.IN_PROGRESS.DESCRIPTION'), true) loader = @confirm.loader(@translate.instant('PROJECT.IMPORT.IN_PROGRESS.TITLE'),
@translate.instant('PROJECT.IMPORT.IN_PROGRESS.DESCRIPTION'), true)
loader.start() loader.start()
promise = @rs.projects.import(file, loader.update) promise = @rs.projects.import(file, loader.update)
@importProjectService.importPromise(promise).finally () -> loader.stop()
@importProjectService.importPromise(promise).finally () => loader.stop()
return return

1
app/partials/us/us-detail.jade
View File

@ -112,6 +112,7 @@ div.wrapper(
div.ticket-watchers( div.ticket-watchers(
tg-watchers tg-watchers
ng-model="us" ng-model="us"
item="us"
required-perm="modify_us" required-perm="modify_us"
) )