Initial changes to support document tags

apps/documents/forms.py

@@ -364,10 +364,21 @@ class MetaDataImageWidget(forms.widgets.Widget):
 
         output.append(u'<div style="white-space:nowrap; overflow: auto;">')
         for document in value['group_data']:
+            tags_template = []
+            tag_count = document.tags.count()
+            if tag_count:
+                tags_template.append(u'<div class="tc">')
+                tags_template.append(u'%(tag_string)s (%(tag_count)s): ' % {
+                    'tag_string': _(u'Tags'), 'tag_count': tag_count})
+                
+                tags_template.append(u', '.join(document.tags.values_list('name', flat=True)))
+                tags_template.append(u'</div>')
+                                
             output.append(
                 u'''<div style="display: inline-block; margin: 10px; %(current)s">
                         <div class="tc">%(document_name)s</div>
                         <div class="tc">%(page_string)s: %(document_pages)d</div>
+                        %(tags_template)s
                         <div class="tc">
                             <a rel="group_%(group_id)d_documents_gallery" class="fancybox-noscaling" href="%(view_url)s">
                                 <img class="lazy-load" style="border: 1px solid black; margin: 10px;" src="%(media_url)s/images/blank.gif" data-href="%(img)s" />
@@ -389,7 +400,8 @@ class MetaDataImageWidget(forms.widgets.Widget):
                     'details_string': ugettext(u'Select'),
                     'group_id': value['group'].pk,
                     'document_name': document,
-                    'media_url': settings.MEDIA_URL
+                    'media_url': settings.MEDIA_URL,
+                    'tags_template': u''.join(tags_template) if tags_template else u''
                 })
         output.append(u'</div>')
         output.append(

apps/documents/models.py

@@ -9,6 +9,7 @@ from django.contrib.auth.models import User
 
 from python_magic import magic
 
+from taggit.managers import TaggableManager
 from dynamic_search.api import register
 from converter.api import get_page_count
 from converter import TRANFORMATION_CHOICES
@@ -57,6 +58,8 @@ class Document(models.Model):
     checksum = models.TextField(blank=True, null=True, verbose_name=_(u'checksum'), editable=False)
     description = models.TextField(blank=True, null=True, verbose_name=_(u'description'), db_index=True)
 
+    tags = TaggableManager()
+
     class Meta:
         verbose_name = _(u'document')
         verbose_name_plural = _(u'documents')
@@ -444,5 +447,5 @@ class RecentDocument(models.Model):
         verbose_name_plural = _(u'recent documents')
 
 
-register(Document, _(u'document'), ['document_type__name', 'file_mimetype', 'file_filename', 'file_extension', 'documentmetadata__value', 'documentpage__content', 'description'])
+register(Document, _(u'document'), ['document_type__name', 'file_mimetype', 'file_filename', 'file_extension', 'documentmetadata__value', 'documentpage__content', 'description', 'tags__name'])
 #register(Document, _(u'document'), ['document_type__name', 'file_mimetype', 'file_extension', 'documentmetadata__value', 'documentpage__content', 'description', {'field_name':'file_filename', 'comparison':'iexact'}])

apps/documents/views.py

@@ -834,14 +834,14 @@ def document_view_simple(request, document_id):
     ]
 
     subtemplates_dict = [
-            {
-                'name': 'generic_list_subtemplate.html',
-                'title': _(u'metadata'),
-                'object_list': document.documentmetadata_set.all(),
-                'extra_columns': [{'name': _(u'value'), 'attribute': 'value'}],
-                'hide_link': True,
-            },
-        ]
+        {
+            'name': 'generic_list_subtemplate.html',
+            'title': _(u'metadata'),
+            'object_list': document.documentmetadata_set.all(),
+            'extra_columns': [{'name': _(u'value'), 'attribute': 'value'}],
+            'hide_link': True,
+        },
+    ]
 
     metadata_groups, errors = document.get_metadata_groups()
     if (request.user.is_staff or request.user.is_superuser) and errors:
@@ -869,9 +869,20 @@ def document_view_simple(request, document_id):
             }
         )
 
+    subtemplates_dict.append(
+        {
+            'name': 'generic_list_subtemplate.html',
+            'title': _(u'tags'),
+            'object_list': document.tags.all(),
+            #'extra_columns': [{'name': _(u'value'), 'attribute': 'value'}],
+            'hide_link': True,
+        }
+    )
+
     return render_to_response('generic_detail.html', {
         'form_list': form_list,
         'object': document,
+        'document': document,
         'subtemplates_dict': subtemplates_dict,
     }, context_instance=RequestContext(request))