Merge remote-tracking branch 'origin/master'

This commit is contained in:
Bc. Petr Pecha 2016-03-16 15:21:05 +01:00
commit 6447584400

View file

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