diff --git a/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee b/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee index 877f8011c..9c9e5aa0b 100644 --- a/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller_form.js.coffee @@ -155,6 +155,9 @@ class App.ControllerForm extends App.Controller # finde selected/checked item of list @_selectedOptions( attribute ) + # filter attributes + @_filterOption( attribute ) + if attribute.tag is 'boolean' # build options list @@ -459,7 +462,7 @@ class App.ControllerForm extends App.Controller App.Log.log 'ControllerForm', 'debug', '_getRelationOptionList:filter-function' all = App[attribute.relation].all() - list = attribute.filter( all ) + list = attribute.filter( all, 'collection' ) # data based filter else if attribute.filter[ attribute.name ] @@ -511,6 +514,15 @@ class App.ControllerForm extends App.Controller } ) + # execute filter + _filterOption: (attribute) -> + return if !attribute.filter + return if !attribute.options + + return if typeof attribute.filter isnt 'function' + App.Log.log 'ControllerForm', 'debug', '_filterOption:filter-function' + + attribute.options = attribute.filter( attribute.options, attribute ) # set selected attributes _selectedOptions: (attribute) -> diff --git a/app/assets/javascripts/app/controllers/customer_ticket_new.js.coffee b/app/assets/javascripts/app/controllers/customer_ticket_new.js.coffee index 2f50b141b..ee2ff5bc4 100644 --- a/app/assets/javascripts/app/controllers/customer_ticket_new.js.coffee +++ b/app/assets/javascripts/app/controllers/customer_ticket_new.js.coffee @@ -196,5 +196,6 @@ class Index extends App.Controller App.Config.set( 'customer_ticket_new', Index, 'Routes' ) -App.Config.set( 'CustomerTicketNew', { prio: 1600, parent: '', name: 'New Ticket', target: '#customer_ticket_new', role: ['Customer'] }, 'NavBar' ) +#App.Config.set( 'CustomerTicketNew', { prio: 1600, parent: '', name: 'New Ticket', target: '#customer_ticket_new', role: ['Customer'] }, 'NavBar' ) +App.Config.set( 'CustomerTicketNew', { prio: 8000, parent: '', name: 'New', target: '#customer_ticket_new', role: ['Customer'] }, 'NavBarRight' ) diff --git a/app/assets/javascripts/app/lib/app_post/i18n.js.coffee b/app/assets/javascripts/app/lib/app_post/i18n.js.coffee index 7225887d5..b371d7e15 100644 --- a/app/assets/javascripts/app/lib/app_post/i18n.js.coffee +++ b/app/assets/javascripts/app/lib/app_post/i18n.js.coffee @@ -21,7 +21,8 @@ class App.i18n _instance ?= new _Singleton _instance.timestamp( args ) -class _Singleton +class _Singleton extends Spine.Module + @include App.Log constructor: -> @locale = 'de' @@ -134,6 +135,8 @@ class _Singleton # escape translated = @escape(translated) + @log 'i18n', 'debug', 'translate', string, args, translated + # return translated string return translated diff --git a/app/assets/javascripts/app/views/generic/admin/edit.jst.eco b/app/assets/javascripts/app/views/generic/admin/edit.jst.eco index 56bbba3ce..b402bc42b 100644 --- a/app/assets/javascripts/app/views/generic/admin/edit.jst.eco +++ b/app/assets/javascripts/app/views/generic/admin/edit.jst.eco @@ -1,6 +1,6 @@