thomas/designbyloven-dev
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some small fixes

Browse Source
This commit is contained in:
Thomas Lovén 2017-05-29 11:50:57 +02:00
parent 7d57c823d6
commit 4cdff53064
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/models.py
View File

@ -44,6 +44,7 @@ class Page(db.Model):
return return
url = "" url = ""
if parent_id: if parent_id:
if self.parent:
url = self.parent.permalink url = self.parent.permalink
url = "/".join(filter(None,[url, name])) url = "/".join(filter(None,[url, name]))
self.permalink = url self.permalink = url

16
app/views.py
View File

@ -5,6 +5,8 @@ from . import app, db, basic_auth
from .models import Page, Photo from .models import Page, Photo
from .forms import PageForm, PhotoForm from .forms import PageForm, PhotoForm
basedir = os.path.abspath(os.path.dirname(__file__))
@app.route('/') @app.route('/')
@app.route('/<path:permalink>') @app.route('/<path:permalink>')
@ -100,14 +102,14 @@ def upload():
db.session.add(photo) db.session.add(photo)
db.session.commit() db.session.commit()
id = photo.id 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) file.save(tempname)
img = Image.open(tempname) img = Image.open(tempname)
filename = '{}.jpg'.format(id) filename = '{}.jpg'.format(id)
imgpath = os.path.join('app', 'photos', filename) imgpath = os.path.join(basedir, 'photos', filename)
thumb = os.path.join('app', 'photos', 'thumbs', filename) thumb = os.path.join(basedir, 'photos', 'thumbs', filename)
slide = os.path.join('app', 'photos', 'slides', filename) slide = os.path.join(basedir, 'photos', 'slides', filename)
img.save(imgpath, 'JPEG') img.save(imgpath, 'JPEG')
genimg(img, imgpath, img.size) genimg(img, imgpath, img.size)
genimg(img, slide, (550, 400)) genimg(img, slide, (550, 400))
@ -122,9 +124,9 @@ def admin_delphoto(id):
db.session.delete(photo) db.session.delete(photo)
db.session.commit() db.session.commit()
filename = '{}.jpg'.format(id) filename = '{}.jpg'.format(id)
imgpath = os.path.join('app', 'photos', filename) imgpath = os.path.join(basedir, 'photos', filename)
thumb = os.path.join('app', 'photos', 'thumbs', filename) thumb = os.path.join(basedir, 'photos', 'thumbs', filename)
slide = os.path.join('app', 'photos', 'slides', filename) slide = os.path.join(basedir, 'photos', 'slides', filename)
os.remove(imgpath) os.remove(imgpath)
os.remove(thumb) os.remove(thumb)
os.remove(slide) os.remove(slide)