From 423821f071ee4a7b0f95c31897e0f774b164bc47 Mon Sep 17 00:00:00 2001 From: Juanfran Date: Thu, 9 Mar 2017 15:42:12 +0100 Subject: [PATCH] fix issue #4969 remove attachments from lightbox creation --- app/coffee/modules/common/lightboxes.coffee | 3 +++ app/coffee/modules/issues/lightboxes.coffee | 4 ++++ app/coffee/modules/taskboard/lightboxes.coffee | 3 +++ app/partials/includes/modules/lightbox-create-issue.jade | 1 + 4 files changed, 11 insertions(+) diff --git a/app/coffee/modules/common/lightboxes.coffee b/app/coffee/modules/common/lightboxes.coffee index a10d735d..17fe81bd 100644 --- a/app/coffee/modules/common/lightboxes.coffee +++ b/app/coffee/modules/common/lightboxes.coffee @@ -315,6 +315,9 @@ CreateEditUserstoryDirective = ($repo, $model, $rs, $rootScope, lightboxService, attachmentsToAdd = attachmentsToAdd.push(attachment) $scope.deleteAttachment = (attachment) -> + attachmentsToAdd = attachmentsToAdd.filter (it) -> + return it.get('name') != attachment.get('name') + if attachment.get("id") attachmentsToDelete = attachmentsToDelete.push(attachment) diff --git a/app/coffee/modules/issues/lightboxes.coffee b/app/coffee/modules/issues/lightboxes.coffee index 9a51992e..b8d57df3 100644 --- a/app/coffee/modules/issues/lightboxes.coffee +++ b/app/coffee/modules/issues/lightboxes.coffee @@ -78,6 +78,10 @@ CreateIssueDirective = ($repo, $confirm, $rootscope, lightboxService, $loading, $scope.addAttachment = (attachment) -> attachmentsToAdd = attachmentsToAdd.push(attachment) + $scope.deleteAttachment = (attachment) -> + attachmentsToAdd = attachmentsToAdd.filter (it) -> + return it.get('name') != attachment.get('name') + $scope.addTag = (tag, color) -> value = trim(tag.toLowerCase()) diff --git a/app/coffee/modules/taskboard/lightboxes.coffee b/app/coffee/modules/taskboard/lightboxes.coffee index df986cf8..19ecb708 100644 --- a/app/coffee/modules/taskboard/lightboxes.coffee +++ b/app/coffee/modules/taskboard/lightboxes.coffee @@ -42,6 +42,9 @@ CreateEditTaskDirective = ($repo, $model, $rs, $rootscope, $loading, lightboxSer attachmentsToAdd = attachmentsToAdd.push(attachment) $scope.deleteAttachment = (attachment) -> + attachmentsToAdd = attachmentsToAdd.filter (it) -> + return it.get('name') != attachment.get('name') + if attachment.get("id") attachmentsToDelete = attachmentsToDelete.push(attachment) diff --git a/app/partials/includes/modules/lightbox-create-issue.jade b/app/partials/includes/modules/lightbox-create-issue.jade index ec245f0a..8cf35fa7 100644 --- a/app/partials/includes/modules/lightbox-create-issue.jade +++ b/app/partials/includes/modules/lightbox-create-issue.jade @@ -43,6 +43,7 @@ form tg-attachments-simple( attachments="attachments", on-add="addAttachment(attachment)" + on-delete="deleteAttachment(attachment)" ) fieldset