From: Yoan Le Clanche <yoanl@pilotsystems.net>
Date: Wed, 12 Jan 2022 11:18:10 +0000 (+0100)
Subject: Merge branch 'prodev' into pb-notelemeta
X-Git-Tag: 2.8.1-pro~128^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a02a1eb6d3c64cbf0caf66b60408e5907fd7fe00;p=teleforma.git

Merge branch 'prodev' into pb-notelemeta
---

a02a1eb6d3c64cbf0caf66b60408e5907fd7fe00
diff --cc teleforma/admin.py
index f1f9ea3e,3d11d3c0..ff4c4487
--- a/teleforma/admin.py
+++ b/teleforma/admin.py
@@@ -141,14 -141,10 +141,14 @@@ class DocumentAdmin(admin.ModelAdmin)
      search_fields = ['title', 'course__title', 'course__code']
      list_filter = ('period', 'date_added')
  
 +class MediaTranscodedInline(admin.TabularInline):
 +    model = MediaTranscoded
 +
  class MediaAdmin(admin.ModelAdmin):
+     date_hierarchy = 'date_added'
      exclude = ['readers']
-     search_fields = ['id', 'title', 'course__title', 'course__code']
-     list_filter = ('period', 'date_added')
+     search_fields = ['id', 'title', 'course__title', 'course__code', 'item__title']
 +    inlines = [MediaTranscodedInline]
  
  class ConferenceAdmin(admin.ModelAdmin):
      exclude = ['readers', 'keywords']
diff --cc teleforma/views/pro.py
index 75f74b62,0fd4cd94..507ccc97
--- a/teleforma/views/pro.py
+++ b/teleforma/views/pro.py
@@@ -218,9 -218,8 +218,9 @@@ class SeminarView(SeminarAccessMixin, D
      def get_context_data(self, **kwargs):
          context = super(SeminarView, self).get_context_data(**kwargs)
          seminar = context['seminar']
 +
          user = self.request.user
- 
+         context['show_webclass'] = seminar.use_webclass(user)
          validated = seminar_validated(user, seminar)
          if validated:
              # check if testimonial exists and create it