type on filter

oarepo · Oct 4, 2020 · 492ea66 · 492ea66
1 parent 417fea7
commit 492ea66
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/oarepo_ui/ext.py b/oarepo_ui/ext.py
@@ -76,10 +76,13 @@ def _translate_filters(self, filters, index_name, **kwargs):
         def _translate(k, filter):
             translation: TranslatedFilter = get_oarepo_attr(filter).get('translation')
             if translation:
-                return {
+                ret = {
                     'label': self.translate_filter_label(translation.label, k, translation.translator, **kwargs)
                     if translation.label is not no_translation else k
                 }
+                if translation.type is not None:
+                    ret['type'] = translation.type
+                return ret
             else:
                 return {
                     'label': self.translate_filter_label(f'oarepo.filters.{index_name}.{{filter_key}}.label',

diff --git a/oarepo_ui/filters.py b/oarepo_ui/filters.py
@@ -3,9 +3,10 @@
 
 
 class TranslatedFilter:
-    def __init__(self, label, translator):
+    def __init__(self, label, translator, type=None):
         self.label = label
         self.translator = translator
+        self.type = type
 
 
 def translate_filters(filters, label=None, translator=None):
@@ -18,11 +19,11 @@ def translate_filters(filters, label=None, translator=None):
     return filters
 
 
-def translate_filter(filter, label=None, translator=None):
+def translate_filter(filter, label=None, translator=None, type=None):
     if not hasattr(filter, '_oarepo_ui'):
         setattr(filter, '_oarepo_ui', {})
     getattr(filter, '_oarepo_ui')['translation'] = TranslatedFilter(
-        label, translator)
+        label, translator, type=type)
     return filter
 
 

diff --git a/tests/config.py b/tests/config.py
@@ -107,7 +107,7 @@ def can(self):
     },
     'translate-filter': {
         'filters': {
-            'category': translate_filter(terms_filter('category'), label='my.own.filter.label')
+            'category': translate_filter(terms_filter('category'), label='my.own.filter.label', type='number')
         }
     },
     'func': {

diff --git a/tests/test_views.py b/tests/test_views.py
@@ -21,7 +21,7 @@ def test_views(app, client):
         'translate-facets-filters-translator': {'facets': {'category': {'label': 'my.own.facet.category'}},
                                                 'filters': {'category': {'label': 'my.own.filter.category'}}},
         'translate-filter': {'facets': {},
-                             'filters': {'category': {'label': 'my.own.filter.label'}}},
+                             'filters': {'category': {'label': 'my.own.filter.label', 'type': 'number'}}},
         'func': {'facets': {'category': {'label': 'my.own.facet.label'}},
                  'filters': {}},
     }
@@ -48,7 +48,7 @@ def test_views(app, client):
         'translate-facets-filters-translator': {'facets': {'category': {'label': 'můj.vlastní.facet.kategorie'}},
                                                 'filters': {'category': {'label': 'můj.vlastní.filter.kategorie'}}},
         'translate-filter': {'facets': {},
-                             'filters': {'category': {'label': 'můj.vlastní.filter.label'}}},
+                             'filters': {'category': {'label': 'můj.vlastní.filter.label', 'type': 'number'}}},
         'func': {'facets': {'category': {'label': 'můj.vlastní.facet.label'}},
                  'filters': {}},
     }
@@ -94,7 +94,7 @@ def test_perms(app, client):
         'translate-facets-filters-translator': {'facets': {'category': {'label': 'my.own.facet.category'}},
                                                 'filters': {'category': {'label': 'my.own.filter.category'}}},
         'translate-filter': {'facets': {},
-                             'filters': {'category': {'label': 'my.own.filter.label'}}},
+                             'filters': {'category': {'label': 'my.own.filter.label', 'type': 'number'}}},
         'func': {'facets': {},
                  'filters': {}}
     }