fnp
/
redakcja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
95070e9
)
fix when there is no gallery dir
author
Jan Szejko
<janek37@gmail.com>
Fri, 12 Jan 2018 13:52:18 +0000
(14:52 +0100)
committer
Jan Szejko
<janek37@gmail.com>
Fri, 12 Jan 2018 13:52:18 +0000
(14:52 +0100)
apps/wiki/views.py
patch
|
blob
|
history
diff --git
a/apps/wiki/views.py
b/apps/wiki/views.py
index
71c1806
..
05b9031
100644
(file)
--- a/
apps/wiki/views.py
+++ b/
apps/wiki/views.py
@@
-91,7
+91,8
@@
def editor(request, slug, chunk=None, template_name='wiki/bootstrap.html'):
text = chunk.at_revision(version).materialize()
else:
text = chunk.materialize()
text = chunk.at_revision(version).materialize()
else:
text = chunk.materialize()
- materials = set(os.listdir(os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR, chunk.book.gallery)))
+ gallery_dir = os.path.join(settings.MEDIA_ROOT, settings.IMAGE_DIR, chunk.book.gallery)
+ materials = set(os.listdir(gallery_dir)) if os.path.isdir(gallery_dir) else []
materials.update([n.rsplit('.', 1)[0] for n in materials])
return render(request, template_name, {
'serialized_document_data': json.dumps({
materials.update([n.rsplit('.', 1)[0] for n in materials])
return render(request, template_name, {
'serialized_document_data': json.dumps({