Merge pull request #1901 from ufo911/master

form_ajax_refs mongoengine.errors.InvalidQueryError: Cannot resolve field "id" and column_editable_list The CSRF token is missing
pallets-eco · Jan 7, 2020 · 69a6984 · 69a6984
2 parents 648d9b9 + 1336450
commit 69a6984
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/flask_admin/contrib/mongoengine/ajax.py b/flask_admin/contrib/mongoengine/ajax.py
@@ -42,10 +42,10 @@ def format(self, model):
         if not model:
             return None
 
-        return (as_unicode(model.id), as_unicode(model))
+        return (as_unicode(model.pk), as_unicode(model))
 
     def get_one(self, pk):
-        return self.model.objects.filter(id=pk).first()
+        return self.model.objects.filter(pk=pk).first()
 
     def get_list(self, term, offset=0, limit=DEFAULT_PAGE_SIZE):
         query = self.model.objects

diff --git a/flask_admin/templates/bootstrap2/admin/model/list.html b/flask_admin/templates/bootstrap2/admin/model/list.html
@@ -138,6 +138,8 @@
                         {% set form = list_forms[get_pk_value(row)] %}
                         {% if form.csrf_token %}
                         {{ form[c](pk=get_pk_value(row), display_value=get_value(row, c), csrf=form.csrf_token._value()) }}
+                        {% elif csrf_token %}
+                        {{ form[c](pk=get_pk_value(row), display_value=get_value(row, c), csrf=csrf_token()) }}
                         {% else %}
                         {{ form[c](pk=get_pk_value(row), display_value=get_value(row, c)) }}
                         {% endif %}

diff --git a/flask_admin/templates/bootstrap3/admin/model/list.html b/flask_admin/templates/bootstrap3/admin/model/list.html
@@ -137,6 +137,8 @@
                         {% set form = list_forms[get_pk_value(row)] %}
                         {% if form.csrf_token %}
                         {{ form[c](pk=get_pk_value(row), display_value=get_value(row, c), csrf=form.csrf_token._value()) }}
+                        {% elif csrf_token %}
+                        {{ form[c](pk=get_pk_value(row), display_value=get_value(row, c), csrf=csrf_token()) }}
                         {% else %}
                         {{ form[c](pk=get_pk_value(row), display_value=get_value(row, c)) }}
                         {% endif %}