Commit a797f934 authored by Serge S. Koval's avatar Serge S. Koval

Fixed #297

parent dee366df
...@@ -81,7 +81,9 @@ class TodoView(ModelView): ...@@ -81,7 +81,9 @@ class TodoView(ModelView):
column_filters = ['done'] column_filters = ['done']
form_ajax_refs = { form_ajax_refs = {
'user': ('name',) 'user': {
'fields': ('name',)
}
} }
......
...@@ -67,7 +67,9 @@ class PostAdmin(ModelView): ...@@ -67,7 +67,9 @@ class PostAdmin(ModelView):
User.username) User.username)
form_ajax_refs = { form_ajax_refs = {
'user': (User.username, 'email') 'user': {
'fields': (User.username, 'email')
}
} }
......
...@@ -2,6 +2,7 @@ from flask import url_for, json ...@@ -2,6 +2,7 @@ from flask import url_for, json
from wtforms.widgets import HTMLString, html_params from wtforms.widgets import HTMLString, html_params
from flask.ext.admin._compat import as_unicode from flask.ext.admin._compat import as_unicode
from flask.ext.admin.babel import gettext
from flask.ext.admin.form import RenderTemplateWidget from flask.ext.admin.form import RenderTemplateWidget
...@@ -51,4 +52,7 @@ class AjaxSelect2Widget(object): ...@@ -51,4 +52,7 @@ class AjaxSelect2Widget(object):
kwargs['value'] = data[0] kwargs['value'] = data[0]
kwargs['data-json'] = json.dumps(data) kwargs['data-json'] = json.dumps(data)
placeholder = gettext(field.loader.options.get('placeholder', 'Please select model'))
kwargs.setdefault('data-placeholder', placeholder)
return HTMLString('<input %s>' % html_params(name=field.name, **kwargs)) return HTMLString('<input %s>' % html_params(name=field.name, **kwargs))
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
var opts = { var opts = {
width: 'resolve', width: 'resolve',
minimumInputLength: 1, minimumInputLength: 1,
placeholder: 'data-placeholder',
ajax: { ajax: {
url: $el.attr('data-url'), url: $el.attr('data-url'),
data: function(term, page) { data: function(term, page) {
......
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