diff --git a/themis/search/indexer.py b/themis/search/indexer.py
index 89bf7e7..311c331 100644
--- a/themis/search/indexer.py
+++ b/themis/search/indexer.py
@@ -18,7 +18,7 @@ def dateIndexer(obj):
return DateTime(getattr(obj, attr).isoformat())
return None
-grok.global_adapter(dateIndexer, name="dateCourrier")
+grok.global_adapter(dateIndexer, name="mailDate")
@indexer(plone.dexterity.interfaces.IDexterityItem)
diff --git a/themis/search/mail.pt b/themis/search/mail.pt
index ffa05df..8be427a 100644
--- a/themis/search/mail.pt
+++ b/themis/search/mail.pt
@@ -35,7 +35,7 @@
- |
+ |
|
diff --git a/themis/search/mail.py b/themis/search/mail.py
index fdc7b65..24a3ac4 100644
--- a/themis/search/mail.py
+++ b/themis/search/mail.py
@@ -101,17 +101,17 @@ class SearchView(BrowserView):
return []
if data.get('date'):
- kw['dateCourrier'] = {'query': [data.get('date'), data.get('date')], 'range': 'minmax'}
+ kw['mailDate'] = {'query': [data.get('date'), data.get('date')], 'range': 'minmax'}
if data.get('text'):
- kw['MailSearchableText'] = data.get('text')
+ kw['mailSearchableText'] = data.get('text')
if data.get('number'):
- kw['numero_courrier'] = data.get('number')
+ kw['mailNumber'] = data.get('number')
if data.get('category'):
- kw['categorie_de_courrier'] = data.get('category')
+ kw['mailCategory'] = data.get('category')
if data.get('subcategory'):
- kw['sous_categorie_de_courrier'] = data.get('subcategory')
+ kw['mailSubcategory'] = data.get('subcategory')
if data.get('contact'):
- kw['MailContactFuzzy'] = data.get('contact')
+ kw['mailContactFuzzy'] = data.get('contact')
if data.get('scope') == 'all':
kw['portal_type'] = ['courrier_entrant', 'courrier_sortant']
@@ -120,7 +120,7 @@ class SearchView(BrowserView):
elif data.get('scope') == 'outgoing':
kw['portal_type'] = ['courrier_sortant']
- kw['sort_on'] = 'dateCourrier'
+ kw['sort_on'] = 'mailDate'
kw['sort_order'] = 'descending'
print 'kw:', kw
catalog = getToolByName(self.context, 'portal_catalog')
diff --git a/themis/search/profiles/default/catalog.xml b/themis/search/profiles/default/catalog.xml
index 08dd872..39d0075 100644
--- a/themis/search/profiles/default/catalog.xml
+++ b/themis/search/profiles/default/catalog.xml
@@ -5,30 +5,30 @@
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
+