diff --git a/app/assets/javascripts/app/controllers/_ui_element/ticket_perform_action.coffee b/app/assets/javascripts/app/controllers/_ui_element/ticket_perform_action.coffee index d53da8ec4..f5e40d8b8 100644 --- a/app/assets/javascripts/app/controllers/_ui_element/ticket_perform_action.coffee +++ b/app/assets/javascripts/app/controllers/_ui_element/ticket_perform_action.coffee @@ -275,12 +275,14 @@ class App.UiElement.ticket_perform_action options = 'current_user.id': App.i18n.translateInline('current user') 'specific': App.i18n.translateInline('specific user') - #'set': App.i18n.translateInline('set') + + if attributeSelected.null is true + options['not_set'] = App.i18n.translateInline('unassign user') + else if preCondition is 'org' options = 'current_user.organization_id': App.i18n.translateInline('current user organization') 'specific': App.i18n.translateInline('specific organization') - #'set': App.i18n.translateInline('set') for key, value of options selected = '' diff --git a/public/assets/tests/form_ticket_perform_action.js b/public/assets/tests/form_ticket_perform_action.js index ba79b63f8..778f17050 100644 --- a/public/assets/tests/form_ticket_perform_action.js +++ b/public/assets/tests/form_ticket_perform_action.js @@ -546,3 +546,62 @@ test( "ticket_perform_action orphan time fields", function() { equal(el.find('.js-valueRangeSelector').length, 0) }); + +test( "ticket_perform_action check possible owner selection", function() { + $('#forms').append('