Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes #2853 regression - Deletion of notes impossible if internal and communication = true

Browse source
This commit is contained in:
Mantas 2020-11-19 18:01:07 +02:00 committed by Thorsten Eckel
parent 492eb1c883
commit cca33e4b5e
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/ticket_zoom/article_action/delete.coffee
View file

@ -43,7 +43,7 @@ class Delete
@deletableForAgent: (actions, ticket, article, ui) -> @deletableForAgent: (actions, ticket, article, ui) ->
return false if ticket.currentView() is 'customer' return false if ticket.currentView() is 'customer'
return false if article.created_by_id != App.User.current()?.id return false if article.created_by_id != App.User.current()?.id
return false if article.type.communication return false if article.type.communication && !article.internal
true true

2
app/policies/ticket/article_policy.rb
View file

@ -29,7 +29,7 @@ class Ticket::ArticlePolicy < ApplicationPolicy
return not_authorized('you can only delete your own notes') return not_authorized('you can only delete your own notes')
end end
if record.type.communication? if record.type.communication? && !record.internal?
return not_authorized('communication articles cannot be deleted') return not_authorized('communication articles cannot be deleted')
end end

4
spec/requests/ticket/article_spec.rb
View file

@ -592,7 +592,7 @@ AAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO
include_examples 'deleting', include_examples 'deleting',
item: 'article_note_communication_self', item: 'article_note_communication_self',
now: false, later: false, much_later: false now: true, later: true, much_later: false
include_examples 'deleting', include_examples 'deleting',
item: 'article_note_communication_other', item: 'article_note_communication_other',
@ -620,7 +620,7 @@ AAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO
include_examples 'deleting', include_examples 'deleting',
item: 'article_note_communication_self', item: 'article_note_communication_self',
now: false, later: false, much_later: false now: true, later: true, much_later: false
include_examples 'deleting', include_examples 'deleting',
item: 'article_note_communication_other', item: 'article_note_communication_other',

4
spec/system/ticket/zoom_spec.rb
View file

@ -368,7 +368,7 @@ RSpec.describe 'Ticket zoom', type: :system do
include_examples 'deleting ticket article', include_examples 'deleting ticket article',
item: 'article_note_communication_self', item: 'article_note_communication_self',
now: false, later: false, much_later: false now: true, later: true, much_later: false
include_examples 'deleting ticket article', include_examples 'deleting ticket article',
item: 'article_note_communication_other', item: 'article_note_communication_other',
@ -396,7 +396,7 @@ RSpec.describe 'Ticket zoom', type: :system do
include_examples 'deleting ticket article', include_examples 'deleting ticket article',
item: 'article_note_communication_self', item: 'article_note_communication_self',
now: false, later: false, much_later: false now: true, later: true, much_later: false
include_examples 'deleting ticket article', include_examples 'deleting ticket article',
item: 'article_note_communication_other', item: 'article_note_communication_other',