Merge branch 'hotfix/LIL-645' into 'master'

LIL-645 See merge request lilcity/backend!158
7 years ago · a563d0be4e
parent e4bcf19ce0 64f98a0e79
commit a563d0be4e
1 changed files with 2 additions and 2 deletions
--- a/apps/school/views.py
+++ b/apps/school/views.py
@ -201,8 +201,8 @@ class SchoolView(TemplateView):
            'school_schedules_purchased': school_schedules_purchased,
            'school_purchased_future': False,
            'subscription_ends': subscription_ends,
-            'prolong_date_start': subscription_ends + timedelta(days=1),
-            'allow_prolong': subscription_ends - date_now <= timedelta(days=14)
+            'prolong_date_start': subscription_ends + timedelta(days=1) if subscription_ends else None,
+            'allow_prolong': subscription_ends - date_now <= timedelta(days=14) if subscription_ends else False,
        })
        return context