View difference between Paste ID: 87LAbhha and 07t4bdza

     #urls
-    url(r'^media/images/(?P<rel_model_tag>(event|member|crag))/(?P<rel_object_id>\d+)/(?P<action>(view|edit))/$', views.image_list, name='image-list')
+          url(r'^media/images/(?P<rel_model_tag>(event|member|crag))/(?P<rel_object_id>\d+)/(?P<action>(view|edit))/$', views.video_list, name='image-list')
-    url(r'^media/videos/(?P<rel_model_tag>(event|member|crag))/(?P<rel_object_id>\d+)/(?P<action>(view|edit))/$', views.video_list, name='video-list')
+          url(r'^media/videos/(?P<rel_model_tag>(event|member|crag))/(?P<rel_object_id>\d+)/(?P<action>(view|edit))/$', views.image_list, name='video-list')
-
+
 
-
+
     def image_list(request, rel_model_tag, rel_object_id, action):
-    def image_list(request, rel_model_tag, rel_object_id, mode):
+        return media_list(request, Image, rel_model_tag, rel_object_id, action)
-        return media_list(request, Image, rel_model_tag, rel_object_id, mode)
+
 
     def video_list(request, rel_model_tag, rel_object_id, action):
-    def video_list(request, rel_model_tag, rel_object_id, mode):
+        return media_list(request, Video, rel_model_tag, rel_object_id, action)
-        return media_list(request, Video, rel_model_tag, rel_object_id, mode)
+
 
     def media_list(request, model, rel_model_tag, rel_object_id, action):
-    def media_list(request, model, rel_model_tag, rel_object_id, mode):
+
         rel_object = get_object_or_404(rel_model, pk=rel_object_id)
 
         if model == Image:
             star_media = rel_object.star_image
         else:
             star_media = rel_object.star_video
 
-
+        filter_params = {}
-        media_list = model.get_object_media(rel_object).filter(~Q(id=star_media.id)).order_by('date_added')
+        if rel_model == Event:
             filter_params['media__event'] = rel_object_id
         elif rel_model == Member:
             filter_params['media__members'] = rel_object_id
         elif rel_model == Crag:
             filter_params['media__crag'] = rel_object_id
 
-        if mode == 'edit':
+        media_list = model.objects.filter(~Q(id=star_media.id)).filter(**filter_params).order_by('media__date_added').all()
-            return media_edit_list(request, model, rel_model_tag, rel_object_id, context)
+
         context = {
-        return media_view_list(request, model, rel_model_tag, rel_object_id, context)
+
             'star_media': star_media,
         }
-    def media_view_list(request, model, rel_model_tag, rel_object_id, context):
+
-        if request.is_ajax():
+        if action == 'edit':
-            context['base_template'] = 'boxes/base-lite.html'
+            return media_edit_list(request, model, rel_model_tag, rel_model_id, context)
-        return render(request, 'media/list-items.html', context)
+
         return media_view_list(request, model, rel_model_tag, rel_model_id, context)
 
-    def media_edit_list(request, model, rel_model_tag, rel_object_id, context):
+
 
-            get_media_edit_record = get_image_edit_record
+  def media_view_list(request, model, rel_model_tag, rel_object_id, context):
       if request.is_ajax():
-            get_media_edit_record = get_video_edit_record
+          context['base_template'] = 'boxes/base-lite.html'
       return render(request, 'media/list-items.html', context)
-        media_list = [get_media_edit_record(media, rel_model_tag, rel_object_id) for media in context['media_list']]
+
 
-        if context['star_media']:
+  def media_edit_list(request, model, rel_model_tag, rel_object_id, context):
-            star_media = get_media_edit_record(context['star_media'], rel_model_tag, rel_object_id)
+      if model == Image:
           get_media_record = get_image_record
-            star_media = None
+      else:
           get_media_record = get_video_record
-        json = simplejson.dumps({
+
       media_list = [get_media_record(media, rel_model_tag, rel_object_id) for media in context['media_list']]
 
-        })
+      if context['star_media']:
-        return HttpResponse(json, content_type=json_response_mimetype(request))
+          star_media = get_media_record(star_media, rel_model_tag, rel_object_id)
           star_media['starred'] = True
       else:
-    def get_image_edit_record(image, rel_model_tag, rel_object_id):
+          star_media = None
-        record = {
+
-            'url': image.image.url,
+      json = simplejson.dumps({
-            'name': image.title or image.filename,
+          'star_media': star_media,
-            'type': mimetypes.guess_type(image.image.path)[0] or 'image/png',
+          'media_list': media_list,
-            'thumbnailUrl': image.thumbnail_2.url,
+      })
-            'size': image.image.size,
+      return HttpResponse(json, content_type=json_response_mimetype(request))
-            'id': image.id,
+
-            'media_id': image.media_ptr.id,
+
-            'starUrl':reverse('image-star', kwargs={'image_id': image.id, 'rel_model_tag': rel_model_tag, 'rel_object_id': rel_object_id}),
+
         title = models.CharField('title', max_length=128, default='', db_index=True, blank=True)
-        return record
+
         crag = models.ForeignKey(Crag, null=True, default=None, blank=True)
         members = models.ManyToManyField(Member, blank=True)
-    def get_video_edit_record(video, rel_model_tag, rel_object_id):
+
-        record = {
+
-            'url': video.embed_url,
+
-            'name': video.title or video.url,
+        def __unicode__(self):
-            'type': None,
+            return self.title
-            'thumbnailUrl': video.thumbnail_2.url,
+
-            'size': None,
+        def get_absolute_url(self):
-            'id': video.id,
+            return self.image.url if self.image else self.video.embed_url
-            'media_id': video.media_ptr.id,
+
-            'starUrl': reverse('video-star', kwargs={'video_id': video.id, 'rel_model_tag': rel_model_tag, 'rel_object_id': rel_object_id}),
+
     class Image(Media):
-        return record
+
                                     processors=[ResizeToFit(width=1024, height=1024, upscale=False)],
                                     format='JPEG',
                                     options={'quality': 75})
         thumbnail_1 = ImageSpecField(source='image',
                                     processors=[SmartResize(width=178, height=134)],
                                     format='JPEG',
                                     options={'quality': 75})
         thumbnail_2 = ImageSpecField(source='image',
                                     #processors=[SmartResize(width=256, height=192)],
-        member = models.ForeignKey(Member, null=True, default=None, blank=True)
+
-        tagged_in_members = models.ManyToManyField(Member, blank=True, related_name="tagged_in_media_set")
+
                                     options={'quality': 75})
 
 
-        @classmethod
+
-        def get_object_media(cls, rel_object):
+
-            filter_params = {}
+
         author = models.CharField('author', max_length=64, default='', blank=True)
-            if rel_object.__class__ == Event:
+
-                filter_params['event'] = rel_object.id
+
-            elif rel_object.__class__ == Member:
+
-                filter_params['member'] = rel_object.id
+
-            elif rel_object.__class__ == Crag:
+
-                filter_params['crag'] = rel_object.id
+
                                     format='JPEG',
-            return cls.objects.filter(**filter_params).all()
+
         thumbnail_2 = ImageSpecField(source='thumbnail',
                                     #processors=[SmartResize(width=256, height=192)],
                                     processors=[ResizeToFit(height=164)],
                                     format='JPEG',
                                     options={'quality': 75})
 
       class Crag(models.Model, WebModel):
           name = models.CharField('name', max_length=64, default='', db_index=True)
           normalized_name = models.CharField('normalized name', max_length=64, default='', editable=False)
           type = models.IntegerField('crag type', null=True, default=None, choices=crag_types)
           description = models.TextField('description', default='', blank=True)
           country = models.ForeignKey('country', null=True, default=None) #TODO: make this not null when db enables it
           latitude = models.FloatField('latitude', null=True, default=None)
           longitude = models.FloatField('longitude', null=True, default=None)
           location_index = FixedCharField('location index', length=24, default='', editable=False, db_index=True) # handled by db, used for marker clustering
           added_by = models.ForeignKey('member', null=True, default=None)
           #route_count = models.IntegerField('route count', null=True, default=None, editable=False)
           date_created = models.DateTimeField('date created', auto_now_add=True, null=True, default=None, editable=False)
           last_modified = models.DateTimeField('last modified', auto_now=True, null=True, default=None, editable=False)
           star_image = models.OneToOneField('Image', null=True, default=None, related_name='star_crags', on_delete=models.SET_NULL)
           star_video = models.OneToOneField('Video', null=True, default=None, related_name='star_crags', on_delete=models.SET_NULL)