Fixed query overhead in QuerySelectField

project/pages/admin.py

@@ -6,7 +6,13 @@
 
 
 class PageDetail(EntryDetail):
+    def _provide_pageblocks(self, form):
+        pageblocks = PageBlock.query.all()
+        for block in form.blocks:
+            setattr(block, "query", pageblocks)
+
     def get(self, entry_id):
+
         if entry_id is None:
             # Restrict creating new pages
             abort(403)
@@ -16,15 +22,12 @@ def get(self, entry_id):
 
         if entry is None:
             abort(404)
-        entry_form = self.update_form(obj=entry)
 
-        pageblocks = [block.title for block in PageBlock.query.all()]
-
-        for block in entry_form.blocks:
-            block.choices = pageblocks
+        form = self.update_form(obj=entry)
+        self._provide_pageblocks(form)
 
         return self.render_response(
-            entry_form=entry_form,
+            entry_form=form,
             entry=entry)
 
     def post(self, entry_id):
@@ -34,6 +37,8 @@ def post(self, entry_id):
 
         # Update an old entry
         form = self.update_form()
+        self._provide_pageblocks(form)
+
         if form.validate_on_submit():
             instance = self.model.bl.get(entry_id)
             instance.bl.update(form.data)

project/pages/forms.py

@@ -1,5 +1,6 @@
 from flask_wtf import Form
 from wtforms import StringField, TextAreaField, SelectField, FieldList
+from wtforms.ext.sqlalchemy.fields import QuerySelectField
 from wtforms.validators import Length
 from project.models import PageBlock
 
@@ -52,6 +53,6 @@ class PageForm(Form):
         ],
     )
     blocks = FieldList(
-        SelectField(),  # choices should be provided in view!
+        QuerySelectField(),  # query should be provided in view
         min_entries=1,
     )