Cleaned up files, removed ununsed imports

apps/grouping/__init__.py

@@ -1,23 +1,11 @@
 from django.utils.translation import ugettext_lazy as _
-#from django.core.urlresolvers import reverse
-#from django.conf import settings
 
-from navigation.api import register_links, register_menu, \
-    register_model_list_columns, register_multi_item_links
-from main.api import register_diagnostic, register_tool
-from permissions.api import register_permissions
-from tags.widgets import get_tags_inline_widget_simple
+from navigation.api import register_links
 
-#from documents.models import Document, DocumentPage, DocumentPageTransformation
-#from documents.staging import StagingFile
-#from documents.conf.settings import ENABLE_SINGLE_DOCUMENT_UPLOAD
 from documents.literals import PERMISSION_DOCUMENT_CREATE, PERMISSION_DOCUMENT_VIEW
-#from documents import document_multiple_clear_transformations
 
 document_group_link = {'text': _(u'group actions'), 'view': 'document_group_view', 'famfam': 'page_go', 'permissions': {'namespace': 'documents', 'permissions': [PERMISSION_DOCUMENT_VIEW]}}
 document_group_back_to_document = {'text': _(u'return to document'), 'view': 'document_view_simple', 'args': 'ref_object.id', 'famfam': 'page', 'permissions': {'namespace': 'documents', 'permissions': [PERMISSION_DOCUMENT_VIEW]}}
 document_group_create_sibling = {'text': _(u'upload new document using same metadata'), 'view': 'document_create_sibling', 'args': 'ref_object.id', 'famfam': 'page_copy', 'permissions': {'namespace': 'documents', 'permissions': [PERMISSION_DOCUMENT_CREATE]}}
 
-#register_multi_item_links(['document_group_view'], [document_multiple_clear_transformations, document_multiple_delete])
-
 register_links(['document_group_view'], [document_group_back_to_document, document_group_create_sibling], menu_name='sidebar')

apps/grouping/forms.py

@@ -1,27 +1,12 @@
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext
-from django.http import HttpResponseRedirect
-from django.utils.http import urlencode
 from django.core.urlresolvers import reverse
 from django.utils.safestring import mark_safe
-from django.forms.formsets import formset_factory
 from django.template.defaultfilters import capfirst
 from django.conf import settings
 
 from tags.widgets import get_tags_inline_widget
-#from common.wizard import BoundFormWizard
-#from common.forms import DetailForm
-#from common.literals import PAGE_SIZE_CHOICES, PAGE_ORIENTATION_CHOICES
-#from common.conf.settings import DEFAULT_PAPER_SIZE
-#from common.conf.settings import DEFAULT_PAGE_ORIENTATION
-#from common.utils import urlquote
-#from metadata.models import MetadataSet, MetadataType
-#from metadata.forms import MetadataFormSet
-
-#from documents.staging import StagingFile
-#from documents.models import Document, DocumentType, \
-#    DocumentPage, DocumentPageTransformation
 
 
 class DocumentGroupImageWidget(forms.widgets.Widget):

apps/grouping/managers.py

@@ -2,7 +2,6 @@ from django.db import models
 from django.db.models import Q
 
 from metadata.classes import MetadataObject
-from metadata.models import DocumentMetadata
 from documents.models import Document
 
 from grouping.literals import INCLUSION_AND, INCLUSION_OR
@@ -18,7 +17,7 @@ class DocumentGroupManager(models.Manager):
         eval_dict = {}
         eval_dict['document'] = document
         eval_dict['metadata'] = MetadataObject(metadata_dict)
-        
+
         if group_obj:
             groups_qs = self.model.objects.filter(Q(enabled=True) & Q(pk=group_obj.pk))
         else:
@@ -39,7 +38,7 @@ class DocumentGroupManager(models.Manager):
                             total_query &= query
                         elif item.inclusion == INCLUSION_OR:
                             total_query |= query
-                    
+
                     elif cls == u'document':
                         value_query = Q(**{
                             '%s__%s' % (attribute, item.operator): eval(item.expression, eval_dict)
@@ -51,8 +50,8 @@ class DocumentGroupManager(models.Manager):
                         if item.inclusion == INCLUSION_AND:
                             total_query &= query
                         elif item.inclusion == INCLUSION_OR:
-                            total_query |= query                        
-                    
+                            total_query |= query
+
                 except Exception, e:
                     errors.append(e)
                     value_query = Q()
@@ -66,7 +65,7 @@ class DocumentGroupManager(models.Manager):
                     errors.append(e)
             else:
                 document_groups[group] = {'documents': []}
-            
+
             if group.dynamic_title:
                 try:
                     document_groups[group]['title'] = eval(group.dynamic_title, eval_dict)
@@ -74,7 +73,7 @@ class DocumentGroupManager(models.Manager):
                     document_groups[group]['title'] = 'Error; %s' % e
             else:
                 document_groups[group]['title'] = group.title
-                
+
         if group_obj:
             # Return a single group if documents even if there were
             # many matches

apps/grouping/models.py

@@ -1,8 +1,6 @@
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
-from documents.models import Document
-
 from grouping.managers import DocumentGroupManager
 from grouping.literals import OPERATOR_CHOICES, INCLUSION_AND, \
     INCLUSION_CHOICES
@@ -28,7 +26,7 @@ class DocumentGroupItem(models.Model):
     inclusion = models.CharField(default=INCLUSION_AND, max_length=16, choices=INCLUSION_CHOICES, help_text=_(u'The inclusion is ignored for the first item.'))
     foreign_document_data = models.CharField(max_length=32, verbose_name=_(u'foreign document data'), help_text=_(u'This represents the metadata of all other documents.  Available objects: `document.<attribute>` and `metadata.<metadata_type_name>`.'))
     operator = models.CharField(max_length=16, choices=OPERATOR_CHOICES)
-    
+
     #local_document_data = models.ForeignKey(MetadataType, related_name='metadata_type_local', verbose_name=_(u'local metadata'), help_text=_(u'This represents the metadata of the current document.'))
     expression = models.TextField(verbose_name=_(u'expression'), help_text=_(u'This expression will be evaluated against the current selected document.  The document metadata is available as variables `metadata` and document properties under the variable `document`.'))
     negated = models.BooleanField(default=False, verbose_name=_(u'negated'), help_text=_(u'Inverts the logic of the operator.'))

apps/grouping/views.py

@@ -6,7 +6,6 @@ from django.template import RequestContext
 
 from documents.literals import PERMISSION_DOCUMENT_VIEW
 from documents.models import Document
-from documents.views import document_list
 from permissions.api import check_permissions
 
 from grouping.models import DocumentGroup