Merge branch 'master' of github.com:mrjoes/flask-admin

flask_admin/contrib/sqla/view.py

@@ -500,18 +500,6 @@ class ModelView(BaseModelView):
 
         return bool(self.column_searchable_list)
 
-    def is_text_column_type(self, name):
-        """
-            Verify if the provided column type is text-based.
-
-            :returns:
-                ``True`` for ``String``, ``Unicode``, ``Text``, ``UnicodeText``, ``varchar``
-        """
-        if name:
-            name = name.lower()
-
-        return name in ('string', 'unicode', 'text', 'unicodetext', 'varchar')
-
     def scaffold_filters(self, name):
         """
             Return list of enabled filters
@@ -547,7 +535,7 @@ class ModelView(BaseModelView):
 
                         if join_tables:
                             self._filter_joins[table.name] = join_tables
-                        elif self._need_join(table.name):
+                        elif self._need_join(table):
                             self._filter_joins[table.name] = [table]
                         filters.extend(flt)
 

flask_admin/form/upload.py

@@ -310,7 +310,7 @@ class ImageUploadField(FileUploadField):
                         upload = FileUploadField('File', namegen=prefix_name)
 
             :param allowed_extensions:
-                List of allowed extensions. If not provided, will allow any file.
+                List of allowed extensions. If not provided, then gif, jpg, jpeg, png and tiff will be allowed.
             :param max_size:
                 Tuple of (width, height, force) or None. If provided, Flask-Admin will
                 resize image to the desired size.

flask_admin/helpers.py

@@ -4,7 +4,6 @@ from flask import g, request, url_for, flash
 from wtforms.validators import DataRequired, InputRequired
 
 from flask.ext.admin._compat import urljoin, urlparse, iteritems
-from flask.ext.admin.babel import gettext
 
 from ._compat import string_types
 
@@ -96,6 +95,7 @@ def is_field_error(errors):
     
     
 def flash_errors(form, message):
+    from flask.ext.admin.babel import gettext
     for field_name, errors in iteritems(form.errors):
         errors = form[field_name].label.text + u": " + u", ".join(errors)
         flash(gettext(message, error=str(errors)), 'error')

flask_admin/model/filters.py

@@ -266,7 +266,7 @@ def convert(*args):
         See :mod:`flask.ext.admin.contrib.sqla.filters` for usage example.
     """
     def _inner(func):
-        func._converter_for = map(str.lower, args)
+        func._converter_for = list(map(str.lower, args))
         return func
     return _inner