]> git.parisson.com Git - teleforma.git/commitdiff
cleanup
authoryomguy <yomguy@parisson.com>
Fri, 25 Jan 2013 17:09:51 +0000 (18:09 +0100)
committeryomguy <yomguy@parisson.com>
Fri, 25 Jan 2013 17:09:51 +0000 (18:09 +0100)
teleforma/views/core.py
teleforma/views/pro.py

index 742857c89484f70e9f32b6da6c111a5ffd42099d..a126b3911e9b5f0389e625338ca0249d77b1830c 100644 (file)
@@ -274,6 +274,9 @@ class MediaView(DetailView):
         media = self.get_object()
         if not media.mime_type:
             media.set_mime_type()
+        if not self.request.user in media.readers.all():
+            media.readers.add(user)
+        context['media'] = media
         context['mime_type'] = media.mime_type
         context['course'] = media.course
         context['item'] = media.item
@@ -285,10 +288,6 @@ class MediaView(DetailView):
         else:
             context['room'] = get_room(name=media.item.title, content_type=content_type,
                                    id=media.id)
-        access = get_seminar_media_access(media, seminars)
-        if not access:
-            context['access_error'] = access_error
-            context['message'] = contact_message
         context['periods'] = get_periods(self.request.user)
         return context
 
index e2149daf3fd46311baf6fba1429a310dc02d257e..854ec124866a9977ac24d58c72612313c1384b87 100644 (file)
@@ -215,10 +215,7 @@ class SeminarMediaView(SeminarAccessMixin, MediaView):
         user = self.request.user
         media = self.get_object()
         seminar = Seminar.objects.get(pk=self.kwargs['id'])
-        if not user in media.readers.all():
-            media.readers.add(user)
         context['seminar'] = seminar
-        context['media'] = media
         context['seminar_progress'] = seminar_progress(user, seminar)
         set_revision(user, seminar)
         return context