Added extra context support to document list view and updated document group list view to use it

apps/documents/views.py

@@ -74,15 +74,20 @@ from documents.literals import UPLOAD_SOURCE_LOCAL, \
     UPLOAD_SOURCE_STAGING, UPLOAD_SOURCE_USER_STAGING
     
 
-def document_list(request, object_list=None, title=None):
+def document_list(request, object_list=None, title=None, extra_context=None):
     check_permissions(request.user, [PERMISSION_DOCUMENT_VIEW])
-
+    
-    return render_to_response('generic_list.html', {
+    context = {
         'object_list': object_list if not (object_list is None) else Document.objects.only('file_filename', 'file_extension').all(),
         'title': title if title else _(u'documents'),
         'multi_select_as_buttons': True,
         'hide_links': True,
-    }, context_instance=RequestContext(request))
+    }
+    if extra_context:
+        context.update(extra_context)
+        
+    return render_to_response('generic_list.html', context,
+        context_instance=RequestContext(request))
 
 
 def document_create(request):

apps/grouping/views.py

@@ -4,9 +4,8 @@ from django.http import HttpResponseRedirect
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 
-from documents.literals import PERMISSION_DOCUMENT_VIEW
 from documents.models import Document
-from permissions.api import check_permissions
+from documents.views import document_list
 
 from grouping.models import DocumentGroup
 
@@ -22,18 +21,17 @@ def document_group_action(request):
 
 
 def document_group_view(request, document_id, document_group_id):
-    check_permissions(request.user, [PERMISSION_DOCUMENT_VIEW])
-
     document = get_object_or_404(Document, pk=document_id)
     document_group = get_object_or_404(DocumentGroup, pk=document_group_id)
     object_list, errors = DocumentGroup.objects.get_groups_for(document, document_group)
 
-    return render_to_response('generic_list.html', {
+    return document_list(
-        'object_list': object_list['documents'],
+        request, 
-        'title': _(u'documents in group: %(group)s') % {
+        title=_(u'documents in group: %(group)s') % {
             'group': object_list['title']
         },
-        'multi_select_as_buttons': True,
+        object_list=object_list['documents'],
-        'hide_links': True,
+        extra_context={
-        'ref_object': document
+            'ref_object': document
-    }, context_instance=RequestContext(request))
+        }
+    )