]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'dev' into feature/webclass-correction
authorYoan Le Clanche <yoanl@pilotsystems.net>
Mon, 16 Aug 2021 08:51:53 +0000 (10:51 +0200)
committerYoan Le Clanche <yoanl@pilotsystems.net>
Mon, 16 Aug 2021 08:51:53 +0000 (10:51 +0200)
1  2 
teleforma/templates/teleforma/course_detail.html
teleforma/views/core.py
teleforma/webclass/models.py

index af1d65eb528f717cfb9b49ad92b578204a824edf,518d9f3b721d0121f772961e400daf7efaff31cc..39cdec4d4d1f2afaa100d54d6dd49631dcd903a0
@@@ -491,10 -493,11 +493,11 @@@ class CourseView(CourseAccessMixin, Det
                      webclass_slot = webclass.get_slot(self.request.user)
          context['webclass'] = webclass
          context['webclass_slot'] = webclass_slot
+         context['webclass_not_over'] = webclass and webclass.is_not_over()
  
 +        records = {}
          try:
 -            context['webclass_records'] = WebclassRecord.get_records(
 -                context['period'], course)
 +            records = WebclassRecord.get_records(context['period'], course)
          except Exception as e:
              print(e)
              context['webclass_error'] = True
Simple merge