mam
/
mamweb
11
0
Fork 0
Code Issues Pull Requests 9 Projects Releases Wiki Activity
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
daa046d287 47005053f9
commit
fb0a2b5a7c
1 changed files with 3 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      seminar/admin.py

5
seminar/admin.py
View File

@ -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

Write Preview
Loading…
Cancel
Save