From c74f21824b6208bcd8d78b0604f20e32b85d3d12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Fri, 1 Aug 2014 13:49:48 +0200 Subject: [PATCH] Fix an error with the new created attachments --- app/coffee/modules/common/attachments.coffee | 5 +++-- app/coffee/modules/resources/attachments.coffee | 10 ++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/coffee/modules/common/attachments.coffee b/app/coffee/modules/common/attachments.coffee index 0c7b52b3..df6bf149 100644 --- a/app/coffee/modules/common/attachments.coffee +++ b/app/coffee/modules/common/attachments.coffee @@ -235,6 +235,7 @@ AttachmentDirective = ($log, $repo, $confirm) -> attachment = $scope.$eval($attrs.tgAttachment) render(attachment, attachment.isCreatedRightNow) + delete attachment.isCreatedRightNow ########### ## Actions (on view mode) @@ -246,8 +247,8 @@ AttachmentDirective = ($log, $repo, $confirm) -> $el.on "click", "a.settings.icon-delete", (event) -> event.preventDefault() - title = "Delete attachment" # i18n - subtitle = "the attachment '#{attachment.name}'" + title = "Delete attachment" #TODO: i18in + subtitle = "the attachment '#{attachment.name}'" #TODO: i18in onSuccess = -> $ctrl.loadAttachments(attachment.object_id) diff --git a/app/coffee/modules/resources/attachments.coffee b/app/coffee/modules/resources/attachments.coffee index 764c4868..9e76943d 100644 --- a/app/coffee/modules/resources/attachments.coffee +++ b/app/coffee/modules/resources/attachments.coffee @@ -24,7 +24,7 @@ taiga = @.taiga sizeFormat = @.taiga.sizeFormat -resourceProvider = ($rootScope, $urls, $repo, $auth, $q) -> +resourceProvider = ($rootScope, $urls, $model, $repo, $auth, $q) -> service = {} service.list = (urlName, objectId) -> @@ -52,7 +52,9 @@ resourceProvider = ($rootScope, $urls, $repo, $auth, $q) -> data = JSON.parse(evt.target.responseText) catch data = {} - defered.resolve(data) + + model = $model.make_model(urlName, data) + defered.resolve(model) uploadFailed = (evt) => $rootScope.$apply -> @@ -81,5 +83,5 @@ resourceProvider = ($rootScope, $urls, $repo, $auth, $q) -> module = angular.module("taigaResources") -module.factory("$tgAttachmentsResourcesProvider", ["$rootScope", "$tgUrls", "$tgRepo", "$tgAuth", "$q", - resourceProvider]) +module.factory("$tgAttachmentsResourcesProvider", ["$rootScope", "$tgUrls", "$tgModel", "$tgRepo", "$tgAuth", + "$q", resourceProvider])