Unverified Commit d6270144 authored by Serge S. Koval's avatar Serge S. Koval Committed by GitHub

Merge pull request #1796 from ufo911/master

Added Mongoengine ReferenceField Search And fix MongoImageInput call tabbed
parents bf17b7ad 5db02de0
...@@ -140,7 +140,8 @@ class ModelView(BaseModelView): ...@@ -140,7 +140,8 @@ class ModelView(BaseModelView):
allowed_search_types = (mongoengine.StringField, allowed_search_types = (mongoengine.StringField,
mongoengine.URLField, mongoengine.URLField,
mongoengine.EmailField) mongoengine.EmailField,
mongoengine.ReferenceField)
""" """
List of allowed search field types. List of allowed search field types.
""" """
...@@ -466,7 +467,12 @@ class ModelView(BaseModelView): ...@@ -466,7 +467,12 @@ class ModelView(BaseModelView):
criteria = None criteria = None
for field in self._search_fields: for field in self._search_fields:
flt = {'%s__%s' % (field.name, op): term} if type(field) == mongoengine.ReferenceField:
import re
regex = re.compile('.*%s.*' % term)
else:
regex = term
flt = {'%s__%s' % (field.name, op): regex}
q = mongoengine.Q(**flt) q = mongoengine.Q(**flt)
if criteria is None: if criteria is None:
......
...@@ -47,10 +47,8 @@ class MongoImageInput(object): ...@@ -47,10 +47,8 @@ class MongoImageInput(object):
' <input type="checkbox" name="%(marker)s">Delete</input>' ' <input type="checkbox" name="%(marker)s">Delete</input>'
'</div>') '</div>')
def __call__(self, field, **kwargs):
def __call__(self, field, **kwargs):
kwargs.setdefault('id', field.id) kwargs.setdefault('id', field.id)
placeholder = '' placeholder = ''
if field.data and isinstance(field.data, ImageGridFsProxy): if field.data and isinstance(field.data, ImageGridFsProxy):
args = helpers.make_thumb_args(field.data) args = helpers.make_thumb_args(field.data)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment