1 files changed, 12 insertions, 2 deletions
diff --git a/app/utils/views.py b/app/utils/views.py
index b1decf6..c5f3f59 100644
--- a/app/utils/views.py
+++ b/app/utils/views.py
@@ -1,5 +1,6 @@
+from itertools import chain
 from django.views.generic import ListView
-from photos.models import LuxImage
+from photos.models import LuxImage, LuxVideo
 from django.shortcuts import render_to_response
 from django.template import RequestContext
 
@@ -22,6 +23,15 @@ class PaginatedListView(ListView):
 
 
 def insert_image(request):
+    """
+    The view that handles the admin insert image/video feature
+    """
     images = LuxImage.objects.all()[:50]
-    return render_to_response('admin/insert_images.html', {'images': images, 'textarea_id': request.GET['textarea']}, context_instance=RequestContext(request))
+    videos = LuxVideo.objects.all()[:10]
+    object_list = sorted(
+        chain(images, videos),
+        key=lambda instance: instance.pub_date,
+        reverse=True
+    )
+    return render_to_response('admin/insert_images.html', {'object_list': object_list, 'textarea_id': request.GET['textarea']}, context_instance=RequestContext(request))