Added search in related fields for peewee

.gitignore

@@ -27,4 +27,7 @@ env
 *.egg
 .eggs
 .tox/
-.env
+.env
+.session.vim
+tags
+tags.tmp

flask_admin/contrib/fileadmin/__init__.py

@@ -835,8 +835,8 @@ def index_view(self, path=None):
             if self.is_accessible_path(rel_path):
                 items.append(item)
 
-        sort_column = request.args.get('sort', None, type=str) or self.default_sort_column
-        sort_desc = request.args.get('desc', 0, type=int) or self.default_desc
+        sort_column = request.args.get('sort', self.default_sort_column, type=str)
+        sort_desc = request.args.get('desc', self.default_desc, type=int)
 
         if sort_column is None:
             if self.default_sort_column:

flask_admin/contrib/peewee/form.py

@@ -1,13 +1,8 @@
 from wtforms import fields
 
-from peewee import (CharField, DateTimeField, DateField, TimeField,
+from peewee import (CharField, DateTimeField, DateField, Model, TimeField,
                     PrimaryKeyField, ForeignKeyField)
 
-try:
-    from peewee import BaseModel
-except ImportError:
-    from peewee import ModelBase as BaseModel
-
 from wtfpeewee.orm import ModelConverter, model_form
 
 from flask_admin import form
@@ -194,7 +189,7 @@ def get_info(self, p):
         info = super(InlineModelConverter, self).get_info(p)
 
         if info is None:
-            if isinstance(p, BaseModel):
+            if isinstance(p, Model):
                 info = InlineFormAdmin(p)
             else:
                 model = getattr(p, 'model', None)

flask_admin/contrib/peewee/view.py

@@ -186,42 +186,41 @@ def scaffold_pk(self):
     def get_pk_value(self, model):
         if self.model._meta.composite_key:
             return tuple([
-                model._data[field_name]
+                getattr(model, field_name)
                 for field_name in self.model._meta.primary_key.field_names])
         return getattr(model, self._primary_key)
 
     def scaffold_list_columns(self):
-        columns = []
-
-        for n, f in self._get_model_fields():
-            # Verify type
-            field_class = type(f)
-
-            if field_class == ForeignKeyField:
-                columns.append(n)
-            elif self.column_display_pk or field_class != PrimaryKeyField:
-                columns.append(n)
-
-        return columns
+        return [
+            n for n, f in self._get_model_fields()
+            if isinstance(f, ForeignKeyField) or self.column_display_pk or
+            not isinstance(f, (PrimaryKeyField, PrimaryKeyField.__base__))
+        ]
 
     def scaffold_sortable_columns(self):
         columns = dict()
 
         for n, f in self._get_model_fields():
-            if self.column_display_pk or type(f) != PrimaryKeyField:
+            if self.column_display_pk or not isinstance(f, (PrimaryKeyField, PrimaryKeyField.__base__)):
                 columns[n] = f
 
         return columns
 
     def init_search(self):
         if self.column_searchable_list:
             for p in self.column_searchable_list:
-                if isinstance(p, string_types):
+
+                if "." in p:
+                    m, p = p.split('.')
+                    m = getattr(self.model, m).rel_model
+                    p = getattr(m, p)
+
+                elif isinstance(p, string_types):
                     p = getattr(self.model, p)
 
                 # Check type
                 if not isinstance(p, (CharField, TextField)):
-                    raise Exception('Can only search on text columns. ' +
+                    raise Exception('Can only search on text columns. '
                                     'Failed to setup search for "%s"' % p)
 
                 self._search_fields.append(p)

flask_admin/model/base.py

@@ -1570,7 +1570,7 @@ def _on_model_change(self, form, model, is_created):
             self.on_model_change(form, model, is_created)
         except TypeError as e:
             if re.match(r'on_model_change\(\) takes .* 3 .* arguments .* 4 .* given .*', str(e)):
-                msg = ('%s.on_model_change() now accepts third ' +
+                msg = ('%s.on_model_change() now accepts third '
                        'parameter is_created. Please update your code') % self.model
                 warnings.warn(msg)
 

flask_admin/static/admin/css/bootstrap3/admin.css

@@ -90,6 +90,10 @@ div.container > .admin-form {
     margin-bottom: 0px;
 }
 
+body {
+    padding-top: 4px;
+}
+
 /* Modals */
 /* hack to prevent cut-off left side of select2 inside of modal */
 /* may be able to remove this after Bootstrap v3.3.5 */

flask_admin/templates/bootstrap3/admin/base.html

@@ -23,11 +23,6 @@
             <link href="{{ css_url }}" rel="stylesheet">
           {% endfor %}
         {% endif %}
-        <style>
-        body {
-            padding-top: 4px;
-        }
-        </style>
     {% endblock %}
     {% block head %}
     {% endblock %}