From 7225899cf9f32f1c1ff9162dcdb7241dfa91375b Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Mon, 25 Nov 2019 07:59:48 +0100 Subject: [PATCH] Fixed issue #2813 - Useless display of delete icon below note. --- .../ticket_zoom/article_action/delete.coffee | 29 ++++++++++++++----- .../ticket_zoom/article_actions.coffee | 2 +- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_action/delete.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_action/delete.coffee index 3a610c10e..7d4e5437f 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/article_action/delete.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_action/delete.coffee @@ -2,14 +2,27 @@ class Delete @action: (actions, ticket, article, ui) -> return actions if ui.permissionCheck('ticket.customer') - if article.type.name is 'note' - if App.User.current()?.id == article.created_by_id && ui.permissionCheck('ticket.agent') - actions.push { - name: 'delete' - type: 'delete' - icon: 'trash' - href: '#' - } + return actions if article.type.name isnt 'note' + + return actions if App.User.current()?.id != article.created_by_id + + return actions if !ui.permissionCheck('ticket.agent') + + # return if article is older then 10 minutes + created_at = Date.parse(article.created_at) + time_to_show = 600000 - (Date.parse(new Date()) - created_at) + + return actions if time_to_show <= 0 + + actions.push { + name: 'delete' + type: 'delete' + icon: 'trash' + href: '#' + } + + # rerender ations in 10 minutes again to hide delete action of article + ui.delay(ui.render, time_to_show, 'actions-rerender') actions diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/article_actions.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/article_actions.coffee index fbece5315..9beb89b1a 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/article_actions.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/article_actions.coffee @@ -6,7 +6,7 @@ class App.TicketZoomArticleActions extends App.Controller super @render() - render: -> + render: => actions = @actionRow(@ticket, @article) if actions