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

examples/sqla-custom-filter/app.py

@@ -2,7 +2,7 @@ from flask import Flask
 from flask_sqlalchemy import SQLAlchemy
 
 from flask_admin.contrib import sqla
-from flask_admin import expose, Admin
+from flask_admin import Admin
 
 # required for creating custom filters
 from flask_admin.contrib.sqla.filters import BaseSQLAFilter, FilterEqual
@@ -19,6 +19,13 @@ app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///' + app.config['DATABASE_FILE
 app.config['SQLALCHEMY_ECHO'] = True
 db = SQLAlchemy(app)
 
+
+# Flask views
+@app.route('/')
+def index():
+    return '<a href="/admin/">Click me to get to Admin!</a>'
+
+
 # Create model
 class User(db.Model):
     def __init__(self, first_name, last_name, username, email):
@@ -33,13 +40,14 @@ class User(db.Model):
     username = db.Column(db.String(80), unique=True)
     email = db.Column(db.String(120), unique=True)
 
-    # Required for administrative interface. For python 3 please use __str__ instead.
+    # Required for admin interface. For python 3 please use __str__ instead.
     def __unicode__(self):
         return self.username
 
+
 # Create custom filter class
 class FilterLastNameBrown(BaseSQLAFilter):
-    def apply(self, query, value):
+    def apply(self, query, value, alias=None):
         if value == '1':
             return query.filter(self.column == "Brown")
         else:
@@ -48,18 +56,23 @@ class FilterLastNameBrown(BaseSQLAFilter):
     def operation(self):
         return 'is Brown'
 
+
 # Add custom filter and standard FilterEqual to ModelView
 class UserAdmin(sqla.ModelView):
     # each filter in the list is a filter operation (equals, not equals, etc)
     # filters with the same name will appear as operations under the same filter
     column_filters = [
         FilterEqual(User.last_name, 'Last Name'),
-        FilterLastNameBrown(User.last_name, 'Last Name', options=(('1', 'Yes'),('0', 'No')))
+        FilterLastNameBrown(
+            User.last_name, 'Last Name', options=(('1', 'Yes'), ('0', 'No'))
+        )
     ]
 
+
 admin = Admin(app, template_mode="bootstrap3")
 admin.add_view(UserAdmin(User, db.session))
 
+
 def build_sample_db():
     db.drop_all()
     db.create_all()
@@ -70,6 +83,7 @@ def build_sample_db():
     db.session.add_all([user_obj1, user_obj2, user_obj3])
     db.session.commit()
 
+
 if __name__ == '__main__':
     build_sample_db()
-    app.run(port=5000)
+    app.run(port=5000, debug=True)

flask_admin/actions.py

@@ -3,6 +3,7 @@ from flask import request, redirect
 
 from flask_admin import tools
 from flask_admin._compat import text_type
+from flask_admin.helpers import get_redirect_target
 
 
 def action(name, text, confirmation=None):
@@ -100,7 +101,8 @@ class ActionsMixin(object):
 
             :param return_view:
                 Name of the view to return to after the request.
-                If not provided, will return user to the index view.
+                If not provided, will return user to the return url in the form
+                or the list view.
         """
         action = request.form.get('action')
         ids = request.form.getlist('rowid')
@@ -113,9 +115,9 @@ class ActionsMixin(object):
             if response is not None:
                 return response
 
-        if not return_view:
-            url = self.get_url('.' + self._default_view)
-        else:
+        if return_view:
             url = self.get_url('.' + return_view)
+        else:
+            url = get_redirect_target() or self.get_url('.index_view')
 
         return redirect(url)

flask_admin/model/widgets.py

@@ -2,7 +2,7 @@ from flask import json
 from jinja2 import escape
 from wtforms.widgets import HTMLString, html_params
 
-from flask_admin._compat import as_unicode
+from flask_admin._compat import as_unicode, text_type
 from flask_admin.babel import gettext
 from flask_admin.helpers import get_url
 from flask_admin.form import RenderTemplateWidget
@@ -113,7 +113,14 @@ class XEditableWidget(object):
             kwargs['data-role'] = 'x-editable-boolean'
         elif subfield.type == 'Select2Field':
             kwargs['data-type'] = 'select'
-            kwargs['data-source'] = dict(subfield.choices)
+            choices = [{'value': x, 'text': y} for x, y in subfield.choices]
+
+            # prepend a blank field to choices if allow_blank = True
+            if getattr(subfield, 'allow_blank', False):
+                choices.insert(0, {'value': '__None', 'text': ''})
+
+            # json.dumps fixes issue with unicode strings not loading correctly
+            kwargs['data-source'] = json.dumps(choices)
         elif subfield.type == 'DateField':
             kwargs['data-type'] = 'combodate'
             kwargs['data-format'] = 'YYYY-MM-DD'
@@ -135,20 +142,22 @@ class XEditableWidget(object):
             kwargs['data-type'] = 'number'
             kwargs['data-step'] = 'any'
         elif subfield.type in ['QuerySelectField', 'ModelSelectField']:
+            # QuerySelectField and ModelSelectField are for relations
             kwargs['data-type'] = 'select'
 
-            choices = {}
+            choices = []
             for choice in subfield:
                 try:
-                    choices[str(choice._value())] = str(choice.label.text)
+                    choices.append({'value': text_type(choice._value()),
+                                    'text': text_type(choice.label.text)})
                 except TypeError:
-                    choices[str(choice._value())] = ""
-            kwargs['data-source'] = choices
+                    # unable to display text value
+                    choices.append({'value': text_type(choice._value()),
+                                    'text': ''})
+
+            # blank field is already included if allow_blank
+            kwargs['data-source'] = json.dumps(choices)
         else:
             raise Exception('Unsupported field type: %s' % (type(subfield),))
 
-        # for Select2, QuerySelectField, and ModelSelectField
-        if getattr(subfield, 'allow_blank', False):
-            kwargs['data-source']['__None'] = ""
-
         return kwargs

flask_admin/static/admin/js/filters.js

@@ -141,7 +141,7 @@ var AdminFilters = function(element, filtersElement, filterGroups, activeFilters
         var filter = subfilters[filterSelection];
         var $inputContainer = $('<td/>').appendTo($el);
          
-        var $newFilterField = createFilterInput($inputContainer, filterValue, filter);
+        var $newFilterField = createFilterInput($inputContainer, filterValue, filter).focus();
         var $styledFilterField = styleFilterInput(filter, $newFilterField);
         
         return $styledFilterField;

flask_admin/templates/bootstrap2/admin/actions.html

@@ -17,6 +17,7 @@
         {% if csrf_token %}
         <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
         {% endif %}
+        <input type="hidden" name="url" value="{{ return_url }}">
         <input type="hidden" id="action" name="action" />
     </form>
     {% endif %}

flask_admin/templates/bootstrap2/admin/model/details.html

@@ -18,7 +18,7 @@
     </li>
     {%- endif -%}
     <li class="active">
-        <a href="javascript:void(0)">{{ _gettext('View Record') }}</a>
+        <a href="javascript:void(0)">{{ _gettext('Details') }}</a>
     </li>
   </ul>
   {% endblock %}

flask_admin/templates/bootstrap3/admin/actions.html

@@ -17,6 +17,7 @@
         {% if csrf_token %}
         <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
         {% endif %}
+        <input type="hidden" name="url" value="{{ return_url }}">
         <input type="hidden" id="action" name="action" />
     </form>
     {% endif %}

flask_admin/templates/bootstrap3/admin/model/details.html

@@ -18,7 +18,7 @@
     </li>
     {%- endif -%}
     <li class="active">
-        <a href="javascript:void(0)">{{ _gettext('View Record') }}</a>
+        <a href="javascript:void(0)">{{ _gettext('Details') }}</a>
     </li>
   </ul>
   {% endblock %}