diff --git a/inventory/routes/settings.py b/inventory/routes/settings.py index 94dc93a..1cd1433 100644 --- a/inventory/routes/settings.py +++ b/inventory/routes/settings.py @@ -5,8 +5,8 @@ from flask import request, flash, redirect, url_for, render_template, jsonify from . import main from .. import db -from ..models import Brand, Item, Area, RoomFunction, Room -from ..utils.load import eager_load_room_relationships +from ..models import Brand, Item, Area, RoomFunction, Room, Image +from ..utils.load import eager_load_room_relationships, chunk_list @main.route('/settings', methods=['GET', 'POST']) def settings(): @@ -66,6 +66,7 @@ def settings(): sections = db.session.query(Area).order_by(Area.name).all() functions = db.session.query(RoomFunction).order_by(RoomFunction.description).all() rooms = eager_load_room_relationships(db.session.query(Room).order_by(Room.name)).all() + images = chunk_list(db.session.query(Image).order_by(Image.timestamp).all(), 6) return render_template('settings.html', title="Settings", @@ -73,7 +74,8 @@ def settings(): types=[{"id": t.id, "name": t.description} for t in types], sections=[s.serialize() for s in sections], functions=[f.serialize() for f in functions], - rooms=[r.serialize() for r in rooms] + rooms=[r.serialize() for r in rooms], + image_list=images ) @main.route("/api/settings", methods=["POST"]) diff --git a/inventory/templates/settings.html b/inventory/templates/settings.html index 2b93cae..e62bc51 100644 --- a/inventory/templates/settings.html +++ b/inventory/templates/settings.html @@ -119,6 +119,10 @@ +
@@ -195,6 +199,22 @@
+
+
+ {% for chunk in image_list %} +
+ {% for image in chunk %} +
+ {{ images.render_image( + id=image.id, + image=image + ) }} +
+ {% endfor %} +
+ {% endfor %} +
+