From 92fead6c0902723ad1dd51f77f89a8cd4c6458ac Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Fri, 3 Mar 2017 10:53:15 +0100 Subject: [PATCH] Fixed issue #821 - Can't select object with type date as filter for overviews. --- .../app/controllers/_ui_element/ticket_selector.coffee | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_ui_element/ticket_selector.coffee b/app/assets/javascripts/app/controllers/_ui_element/ticket_selector.coffee index bd068edf7..925bd79ae 100644 --- a/app/assets/javascripts/app/controllers/_ui_element/ticket_selector.coffee +++ b/app/assets/javascripts/app/controllers/_ui_element/ticket_selector.coffee @@ -18,8 +18,9 @@ class App.UiElement.ticket_selector model: 'Organization' operators_type = - '^datetime$': ['before (absolute)', 'after (absolute)', 'before (relative)', 'within next (relative)', 'within last (relative)', 'after (relative)'] - '^timestamp$': ['before (absolute)', 'after (absolute)', 'before (relative)', 'within next (relative)', 'within last (relative)', 'after (relative)'] + '^datetime$': ['before (absolute)', 'after (absolute)', 'before (relative)', 'after (relative)', 'within next (relative)', 'within last (relative)'] + '^timestamp$': ['before (absolute)', 'after (absolute)', 'before (relative)', 'after (relative)', 'within next (relative)', 'within last (relative)'] + '^date$': ['before (absolute)', 'after (absolute)', 'before (relative)', 'after (relative)', 'within next (relative)', 'within last (relative)'] 'boolean$': ['is', 'is not'] '^radio$': ['is', 'is not'] '^select$': ['is', 'is not'] @@ -28,8 +29,9 @@ class App.UiElement.ticket_selector if attribute.hasChanged operators_type = - '^datetime$': ['before (absolute)', 'after (absolute)', 'before (relative)', 'within next (relative)', 'within last (relative)', 'after (relative)', 'has changed'] - '^timestamp$': ['before (absolute)', 'after (absolute)', 'before (relative)', 'within next (relative)', 'within last (relative)', 'after (relative)', 'has changed'] + '^datetime$': ['before (absolute)', 'after (absolute)', 'before (relative)', 'after (relative)', 'within next (relative)', 'within last (relative)', 'has changed'] + '^timestamp$': ['before (absolute)', 'after (absolute)', 'before (relative)', 'after (relative)', 'within next (relative)', 'within last (relative)', 'has changed'] + '^date$': ['before (absolute)', 'after (absolute)', 'before (relative)', 'after (relative)', 'within next (relative)', 'within last (relative)', 'has changed'] 'boolean$': ['is', 'is not', 'has changed'] '^radio$': ['is', 'is not', 'has changed'] '^select$': ['is', 'is not', 'has changed']