View difference between Paste ID: jVsVq2ZX and xnQheym6

-    #urls
+#urls
-          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/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.image_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')
 
 
 
 
 #views
 def image_list(request, rel_model_tag, rel_object_id, action):
     return media_list(request, Image, rel_model_tag, rel_object_id, action)
 
 
 def video_list(request, rel_model_tag, rel_object_id, action):
     return media_list(request, Video, rel_model_tag, rel_object_id, action)
 
 
 def media_list(request, model, rel_model_tag, rel_object_id, action):
     rel_model = tag_to_model(rel_model_tag)
     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 = {}
     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
 
     media_list = model.objects.filter(~Q(id=star_media.id)).filter(**filter_params).order_by('media__date_added').all()
 
     context = {
         'media_list': media_list,
         'star_media': star_media,
     }
 
     if action == 'edit':
         return media_edit_list(request, model, rel_model_tag, rel_model_id, context)
 
     return media_view_list(request, model, rel_model_tag, rel_model_id, context)
 
 
 def media_view_list(request, model, rel_model_tag, rel_object_id, context):
     if request.is_ajax():
         context['base_template'] = 'boxes/base-lite.html'
     return render(request, 'media/list-items.html', context)
 
 
 def media_edit_list(request, model, rel_model_tag, rel_object_id, context):
     if model == Image:
         get_media_record = get_image_record
     else:
         get_media_record = get_video_record
 
     media_list = [get_media_record(media, rel_model_tag, rel_object_id) for media in context['media_list']]
 
     if context['star_media']:
         star_media = get_media_record(star_media, rel_model_tag, rel_object_id)
         star_media['starred'] = True
     else:
         star_media = None
 
     json = simplejson.dumps({
         'star_media': star_media,
         'media_list': media_list,
     })
     return HttpResponse(json, content_type=json_response_mimetype(request))
 
 
 
-    # models
+
-    class Media(models.Model, WebModel):
+# models
-        title = models.CharField('title', max_length=128, default='', db_index=True, blank=True)
+class Media(models.Model, WebModel):
-        event = models.ForeignKey(Event, null=True, default=None, blank=True)
+    title = models.CharField('title', max_length=128, default='', db_index=True, blank=True)
-        crag = models.ForeignKey(Crag, null=True, default=None, blank=True)
+    event = models.ForeignKey(Event, null=True, default=None, blank=True)
-        members = models.ManyToManyField(Member, blank=True)
+    crag = models.ForeignKey(Crag, null=True, default=None, blank=True)
-        added_by = models.ForeignKey(Member, related_name='added_images')
+    members = models.ManyToManyField(Member, blank=True)
-        date_added = models.DateTimeField('date added', auto_now_add=True, null=True, default=None, editable=False)
+    added_by = models.ForeignKey(Member, related_name='added_images')
     date_added = models.DateTimeField('date added', auto_now_add=True, null=True, default=None, editable=False)
-        def __unicode__(self):
+
-            return self.title
+    def __unicode__(self):
         return self.title
-        def get_absolute_url(self):
+
-            return self.image.url if self.image else self.video.embed_url
+    def get_absolute_url(self):
         return self.image.url if self.image else self.video.embed_url
 
-    class Image(Media):
+
-        image = ProcessedImageField(upload_to='uploads',
+class Image(Media):
-                                    processors=[ResizeToFit(width=1024, height=1024, upscale=False)],
+    image = ProcessedImageField(upload_to='uploads',
-                                    format='JPEG',
+                                processors=[ResizeToFit(width=1024, height=1024, upscale=False)],
-                                    options={'quality': 75})
+                                format='JPEG',
-        thumbnail_1 = ImageSpecField(source='image',
+                                options={'quality': 75})
-                                    processors=[SmartResize(width=178, height=134)],
+    thumbnail_1 = ImageSpecField(source='image',
-                                    format='JPEG',
+                                processors=[SmartResize(width=178, height=134)],
-                                    options={'quality': 75})
+                                format='JPEG',
-        thumbnail_2 = ImageSpecField(source='image',
+                                options={'quality': 75})
-                                    #processors=[SmartResize(width=256, height=192)],
+    thumbnail_2 = ImageSpecField(source='image',
-                                    processors=[ResizeToFit(height=164)],
+                                #processors=[SmartResize(width=256, height=192)],
-                                    format='JPEG',
+                                processors=[ResizeToFit(height=164)],
-                                    options={'quality': 75})
+                                format='JPEG',
                                 options={'quality': 75})
 
-    class Video(Media):
+
-        url = models.URLField('url', max_length=256, default='')
+class Video(Media):
-        embed_url = models.URLField('embed url', max_length=256, default='', blank=True)
+    url = models.URLField('url', max_length=256, default='')
-        author = models.CharField('author', max_length=64, default='', blank=True)
+    embed_url = models.URLField('embed url', max_length=256, default='', blank=True)
-        thumbnail = ProcessedImageField(upload_to='uploads',
+    author = models.CharField('author', max_length=64, default='', blank=True)
-                                    processors=[ResizeToFit(width=1024, height=1024, upscale=False)],
+    thumbnail = ProcessedImageField(upload_to='uploads',
-                                    format='JPEG',
+                                processors=[ResizeToFit(width=1024, height=1024, upscale=False)],
-                                    options={'quality': 75}, null=True, default=None, blank=True)
+                                format='JPEG',
-        thumbnail_1 = ImageSpecField(source='thumbnail',
+                                options={'quality': 75}, null=True, default=None, blank=True)
-                                    processors=[SmartResize(width=178, height=134)],
+    thumbnail_1 = ImageSpecField(source='thumbnail',
-                                    format='JPEG',
+                                processors=[SmartResize(width=178, height=134)],
-                                    options={'quality': 75})
+                                format='JPEG',
-        thumbnail_2 = ImageSpecField(source='thumbnail',
+                                options={'quality': 75})
-                                    #processors=[SmartResize(width=256, height=192)],
+    thumbnail_2 = ImageSpecField(source='thumbnail',
-                                    processors=[ResizeToFit(height=164)],
+                                #processors=[SmartResize(width=256, height=192)],
-                                    format='JPEG',
+                                processors=[ResizeToFit(height=164)],
-                                    options={'quality': 75})
+                                format='JPEG',
                                 options={'quality': 75})
-      class Crag(models.Model, WebModel):
+
-          name = models.CharField('name', max_length=64, default='', db_index=True)
+  class Crag(models.Model, WebModel):
-          normalized_name = models.CharField('normalized name', max_length=64, default='', editable=False)
+      name = models.CharField('name', max_length=64, default='', db_index=True)
-          type = models.IntegerField('crag type', null=True, default=None, choices=crag_types)
+      normalized_name = models.CharField('normalized name', max_length=64, default='', editable=False)
-          description = models.TextField('description', default='', blank=True)
+      type = models.IntegerField('crag type', null=True, default=None, choices=crag_types)
-          country = models.ForeignKey('country', null=True, default=None) #TODO: make this not null when db enables it
+      description = models.TextField('description', default='', blank=True)
-          latitude = models.FloatField('latitude', null=True, default=None)
+      country = models.ForeignKey('country', null=True, default=None) #TODO: make this not null when db enables it
-          longitude = models.FloatField('longitude', null=True, default=None)
+      latitude = models.FloatField('latitude', null=True, default=None)
-          location_index = FixedCharField('location index', length=24, default='', editable=False, db_index=True) # handled by db, used for marker clustering
+      longitude = models.FloatField('longitude', null=True, default=None)
-          added_by = models.ForeignKey('member', null=True, default=None)
+      location_index = FixedCharField('location index', length=24, default='', editable=False, db_index=True) # handled by db, used for marker clustering
-          #route_count = models.IntegerField('route count', null=True, default=None, editable=False)
+      added_by = models.ForeignKey('member', null=True, default=None)
-          date_created = models.DateTimeField('date created', auto_now_add=True, null=True, default=None, editable=False)
+      #route_count = models.IntegerField('route count', null=True, default=None, editable=False)
-          last_modified = models.DateTimeField('last modified', auto_now=True, null=True, default=None, editable=False)
+      date_created = models.DateTimeField('date created', auto_now_add=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)
+      last_modified = models.DateTimeField('last modified', auto_now=True, null=True, default=None, editable=False)
-          star_video = models.OneToOneField('Video', null=True, default=None, related_name='star_crags', on_delete=models.SET_NULL)
+      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)