mam/mamweb
11
0
Fork 0
Code Issues Pull requests 7 Projects Wiki Activity Actions

Merge branch 'tex-upload' into stable

Browse source
This commit is contained in:
Matěj Kocián 2017-10-29 10:52:56 +01:00
commit 5bb3a908bf
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
seminar/views.py
View file

@ -786,7 +786,7 @@ def texUploadView(request):
meta = json.loads(q["meta"]) meta = json.loads(q["meta"])
html = q["html"] html = q["html"]
if meta["typ"] in ["uloha", "serial", "reseni"]: if meta["typ"] in ["uloha", "serial", "reseni", "tema"]:
# Uložíme soubory # Uložíme soubory
if meta["typ"] != "reseni": if meta["typ"] != "reseni":
@ -801,6 +801,7 @@ def texUploadView(request):
"uloha": Problem.TYP_ULOHA, "uloha": Problem.TYP_ULOHA,
"serial": Problem.TYP_SERIAL, "serial": Problem.TYP_SERIAL,
"reseni": Problem.TYP_ULOHA, "reseni": Problem.TYP_ULOHA,
"tema": Problem.TYP_TEMA,
} }
problem_typ = typy[meta["typ"]] problem_typ = typy[meta["typ"]]
@ -852,7 +853,8 @@ def texUploadView(request):
else: else:
problem.text_zadani = html problem.text_zadani = html
problem.nazev = meta["nazev"] problem.nazev = meta["nazev"]
problem.body = meta["body"] if meta["typ"] != "tema":
problem.body = meta["body"]
problem.save() problem.save()
cislo.faze = cislo.FAZE_NAHRANO cislo.faze = cislo.FAZE_NAHRANO