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

Conflicts: seminar/admin.py
8 years ago · fb0a2b5a7c
1 changed files with 3 additions and 4 deletions
--- a/seminar/admin.py
+++ b/seminar/admin.py
@ -419,11 +419,10 @@ class ProblemAdmin(VersionAdmin):
        readonly_fields = ['timestamp', 'import_dakos_id']
        if not obj:
            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']
-        if obj.cislo_reseni:
-            if obj.cislo_reseni.faze != 'admin':
-                readonly_fields += ['text_reseni']
+        if obj.cislo_reseni and obj.cislo_reseni.faze != 'admin':
+            readonly_fields += ['text_reseni']
        return readonly_fields

    def get_queryset(self, request):