Merge branch 'prodev' into pb-notelemeta

diff --cc teleforma/admin.py
index f1f9ea3eb1c3610f9a7920a0ba0e5ab103d34d9d,3d11d3c058efea325506fdb190c2bb99a695e727..ff4c44877904873aa2a53bd7b7fb562697aa8ad6
--- 1/teleforma/admin.py
--- 2/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/models/pro.py
Simple merge

diff --cc teleforma/templates/teleforma/seminar_detail.html
Simple merge

diff --cc teleforma/views/pro.py
index 75f74b62d6b90b65a309bf67eef76e38d06ad076,0fd4cd944f5c3dee9160eff5a9b04b1e6c102392..507ccc972e30e08e76ab04582618532e83558abf
--- 1/teleforma/views/pro.py
--- 2/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