Browse Source

Merge branch 'master' of 195.113.26.193:/akce/MaM/MaMweb/mamweb

Conflicts:
	seminar/admin.py
remotes/origin/prednasky
Bc. Petr Pecha 8 years ago
parent
commit
fb0a2b5a7c
  1. 5
      seminar/admin.py

5
seminar/admin.py

@ -419,10 +419,9 @@ class ProblemAdmin(VersionAdmin):
readonly_fields = ['timestamp', 'import_dakos_id'] readonly_fields = ['timestamp', 'import_dakos_id']
if not obj: if not obj:
return readonly_fields return readonly_fields
if obj.cislo_zadani.faze != 'admin': if obj.cislo_zadani and obj.cislo_zadani.faze != 'admin':
readonly_fields += ['nazev', 'text_zadani', 'body'] readonly_fields += ['nazev', 'text_zadani', 'body']
if obj.cislo_reseni: if obj.cislo_reseni and obj.cislo_reseni.faze != 'admin':
if obj.cislo_reseni.faze != 'admin':
readonly_fields += ['text_reseni'] readonly_fields += ['text_reseni']
return readonly_fields return readonly_fields

Loading…
Cancel
Save