DB: Ještě jeden preload

mo/web/main.py

@@ -2,6 +2,7 @@ from flask import render_template, request, g, redirect, url_for, session
 from flask_wtf import FlaskForm
 import wtforms
 import wtforms.validators as validators
+from sqlalchemy.orm import joinedload
 
 import mo.db as db
 import mo.rights
@@ -108,8 +109,10 @@ def reset():
 @app.route('/')
 def index():
     sess = db.get_session()
-    # FIXME: Preloadovat místa
     roles = []
     if g.user:
-        roles = sess.query(db.UserRole).filter_by(user_id=g.user.user_id).all()
+        roles = (sess.query(db.UserRole)
+                 .filter_by(user_id=g.user.user_id)
+                 .options(joinedload(db.UserRole.place_object))
+                 .all())
     return render_template('main.html', roles=roles, roles_by_type=mo.rights.roles_by_type)