From 580ee04fa2f1cbd28196d23616be29d0f5c10077 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa?= Date: Tue, 10 Jul 2018 16:58:29 +0200 Subject: [PATCH] Delete issues from taskboard --- app/coffee/modules/taskboard/main.coffee | 20 +++++++++++++++++++ .../includes/modules/taskboard-table.jade | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/app/coffee/modules/taskboard/main.coffee b/app/coffee/modules/taskboard/main.coffee index 1b163305..74902c01 100644 --- a/app/coffee/modules/taskboard/main.coffee +++ b/app/coffee/modules/taskboard/main.coffee @@ -327,6 +327,9 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin, taiga @scope.$on "taskboard:task:deleted", (event, task) => @.loadTasks() + @scope.$on "taskboard:issue:deleted", (event, issue) => + @.loadIssues() + @scope.$on("taskboard:task:move", @.taskMove) @scope.$on("assigned-to:added", @.onAssignedToChanged) @@ -523,6 +526,23 @@ class TaskboardController extends mixOf(taiga.Controller, taiga.PageMixin, taiga askResponse.finish(false) @confirm.notify("error") + deleteIssue: (id) -> + issue = @.taskboardIssuesService.getIssue(id) + issue = issue.set('loading-delete', true) + + @rs.issues.getByRef(issue.getIn(['model', 'project']), issue.getIn(['model', 'ref'])) + .then (deletingIssue) => + issue = issue.set('loading-delete', false) + title = @translate.instant("ISSUES.ACTION_DELETE") + message = deletingIssue.subject + @confirm.askOnDelete(title, message).then (askResponse) => + promise = @repo.remove(deletingIssue) + promise.then => + @scope.$broadcast("taskboard:issue:deleted") + askResponse.finish() + promise.then null, -> + askResponse.finish(false) + @confirm.notify("error") taskMove: (ctx, task, oldStatusId, usId, statusId, order) -> task = @taskboardTasksService.getTaskModel(task.get('id')) diff --git a/app/partials/includes/modules/taskboard-table.jade b/app/partials/includes/modules/taskboard-table.jade index 9f03834f..8a72d18a 100644 --- a/app/partials/includes/modules/taskboard-table.jade +++ b/app/partials/includes/modules/taskboard-table.jade @@ -166,7 +166,7 @@ div.taskboard-table( tg-bind-scope, on-toggle-fold="ctrl.toggleFold(id)" on-click-edit="ctrl.editIssue(id)" - on-click-delete="ctrl.deleteTask(id)" + on-click-delete="ctrl.deleteIssue(id)" on-click-assigned-to="ctrl.changeIssueAssignedTo(id)" project="project" item="issue"