Merge remote-tracking branch 'origin/master'

2016-03-16 15:21:05 +01:00 · 2016-03-16 15:21:05 +01:00 · 6447584400
commit 6447584400
parent 169752be87 ba41109339
1 changed files with 2 additions and 1 deletions
--- a/seminar/views.py
+++ b/seminar/views.py
@ -565,7 +565,8 @@ def texUploadView(request):

    def uloz_soubory(files, rocnik, cislo):
        for filename, f in files:
-            path = "{}/{}/{}/{}".format(
+            path = os.path.join(
+                settings.MEDIA_ROOT,
                settings.CISLO_IMG_DIR,
                rocnik,
                cislo,