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

Fixed #1331 - Delete action for tickets not working.

Browse source
This commit is contained in:
Rolf Schmidt 2017-09-05 16:05:28 +02:00
parent ddd7c0d60d
commit ce2ed08e1b
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/assets/javascripts/app/controllers/_ui_element/ticket_perform_action.coffee
View file

@ -33,14 +33,15 @@ class App.UiElement.ticket_perform_action
elements["#{groupKey}.#{config.name}"] = config elements["#{groupKey}.#{config.name}"] = config
# add ticket deletion action # add ticket deletion action
elements['ticket.action'] = if attribute.ticket_delete
name: 'action' elements['ticket.action'] =
display: 'Action' name: 'action'
tag: 'select' display: 'Action'
null: false tag: 'select'
translate: true null: false
options: translate: true
delete: 'delete' options:
delete: 'Delete'
[defaults, groups, elements] [defaults, groups, elements]

2
app/assets/javascripts/app/models/job.coffee
View file

@ -6,7 +6,7 @@ class App.Job extends App.Model
{ name: 'name', display: 'Name', tag: 'input', type: 'text', limit: 100, null: false }, { name: 'name', display: 'Name', tag: 'input', type: 'text', limit: 100, null: false },
{ name: 'timeplan', display: 'When should the job run?', tag: 'timer', null: true }, { name: 'timeplan', display: 'When should the job run?', tag: 'timer', null: true },
{ name: 'condition', display: 'Conditions for effected objects', tag: 'ticket_selector', null: true }, { name: 'condition', display: 'Conditions for effected objects', tag: 'ticket_selector', null: true },
{ name: 'perform', display: 'Execute changes on objects', tag: 'ticket_perform_action', null: true, notification: true }, { name: 'perform', display: 'Execute changes on objects', tag: 'ticket_perform_action', null: true, notification: true, ticket_delete: true },
{ name: 'disable_notification', display: 'Disable Notifications', tag: 'boolean', default: true }, { name: 'disable_notification', display: 'Disable Notifications', tag: 'boolean', default: true },
{ name: 'note', display: 'Note', tag: 'textarea', note: 'Notes are visible to agents only, never to customers.', limit: 250, null: true }, { name: 'note', display: 'Note', tag: 'textarea', note: 'Notes are visible to agents only, never to customers.', limit: 250, null: true },
{ name: 'active', display: 'Active', tag: 'active', default: true }, { name: 'active', display: 'Active', tag: 'active', default: true },