From 4cdff53064261883572049db67a205d01305267d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Lov=C3=A9n?= Date: Mon, 29 May 2017 11:50:57 +0200 Subject: [PATCH] Some small fixes --- app/models.py | 3 ++- app/views.py | 16 +++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/models.py b/app/models.py index bdeed0a..fb39a1c 100644 --- a/app/models.py +++ b/app/models.py @@ -44,7 +44,8 @@ class Page(db.Model): return url = "" if parent_id: - url = self.parent.permalink + if self.parent: + url = self.parent.permalink url = "/".join(filter(None,[url, name])) self.permalink = url print("Set permalink of " + repr(name) + " to " + url) diff --git a/app/views.py b/app/views.py index da83a52..c5120d6 100644 --- a/app/views.py +++ b/app/views.py @@ -5,6 +5,8 @@ from . import app, db, basic_auth from .models import Page, Photo from .forms import PageForm, PhotoForm +basedir = os.path.abspath(os.path.dirname(__file__)) + @app.route('/') @app.route('/') @@ -100,14 +102,14 @@ def upload(): db.session.add(photo) db.session.commit() id = photo.id - tempname = os.path.join('app/photos', secure_filename(file.filename)) + tempname = os.path.join(basedir, 'photos', secure_filename(file.filename)) file.save(tempname) img = Image.open(tempname) filename = '{}.jpg'.format(id) - imgpath = os.path.join('app', 'photos', filename) - thumb = os.path.join('app', 'photos', 'thumbs', filename) - slide = os.path.join('app', 'photos', 'slides', filename) + imgpath = os.path.join(basedir, 'photos', filename) + thumb = os.path.join(basedir, 'photos', 'thumbs', filename) + slide = os.path.join(basedir, 'photos', 'slides', filename) img.save(imgpath, 'JPEG') genimg(img, imgpath, img.size) genimg(img, slide, (550, 400)) @@ -122,9 +124,9 @@ def admin_delphoto(id): db.session.delete(photo) db.session.commit() filename = '{}.jpg'.format(id) - imgpath = os.path.join('app', 'photos', filename) - thumb = os.path.join('app', 'photos', 'thumbs', filename) - slide = os.path.join('app', 'photos', 'slides', filename) + imgpath = os.path.join(basedir, 'photos', filename) + thumb = os.path.join(basedir, 'photos', 'thumbs', filename) + slide = os.path.join(basedir, 'photos', 'slides', filename) os.remove(imgpath) os.remove(thumb) os.remove(slide)