From 0a5e83723642c0bd8f7ed7fca329eb7bed0ced9c Mon Sep 17 00:00:00 2001 From: Damien De Paoli Date: Thu, 24 Jun 2021 17:33:42 +1000 Subject: [PATCH] support multiple paths in move DBox via new StoragePathNames() function, and pass that through to jinja --- main.py | 3 +++ path.py | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/main.py b/main.py index 4ab29f2..e4eb3f2 100644 --- a/main.py +++ b/main.py @@ -7,6 +7,7 @@ from wtforms import SubmitField, StringField, HiddenField, SelectField, IntegerF from flask_wtf import FlaskForm from status import st, Status from shared import CreateSelect, CreateFoldersSelect, LocationIcon, DB_URL + import re import socket @@ -33,6 +34,7 @@ from person import Person from refimg import Refimg from job import Job, GetNumActiveJobs from ai import aistats +from path import StoragePathNames ####################################### GLOBALS ####################################### # allow jinja2 to call these python functions directly @@ -46,6 +48,7 @@ app.jinja_env.globals['ClearJM_Message'] = ClearJM_Message app.jinja_env.globals['CreateSelect'] = CreateSelect app.jinja_env.globals['CreateFoldersSelect'] = CreateFoldersSelect app.jinja_env.globals['LocationIcon'] = LocationIcon +app.jinja_env.globals['StoragePathNames'] = StoragePathNames # default page, just the navbar @app.route("/", methods=["GET"]) diff --git a/path.py b/path.py index 4c93e7c..0ca2418 100644 --- a/path.py +++ b/path.py @@ -28,3 +28,9 @@ class Path(db.Model): def __repr__(self): return f"" +def StoragePathNames(): + ret=[] + sps=Path.query.join(PathType).filter(PathType.name=='Storage').all() + for p in sps: + ret.append(p.path_prefix.replace('static/Storage/','') ) + return ret