diff --git a/apps/documents/forms.py b/apps/documents/forms.py index 8703822b49..39b190baea 100644 --- a/apps/documents/forms.py +++ b/apps/documents/forms.py @@ -2,14 +2,10 @@ 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 diff --git a/apps/documents/models.py b/apps/documents/models.py index c4ad175314..2de24cb20e 100644 --- a/apps/documents/models.py +++ b/apps/documents/models.py @@ -4,7 +4,6 @@ import tempfile from django.db import models from django.utils.translation import ugettext_lazy as _ -from django.db.models import Q from django.contrib.auth.models import User from django.contrib.contenttypes import generic from django.contrib.comments.models import Comment @@ -15,7 +14,6 @@ from taggit.managers import TaggableManager from dynamic_search.api import register from converter.api import get_page_count from converter import TRANFORMATION_CHOICES -from metadata.classes import MetadataObject from documents.conf.settings import CHECKSUM_FUNCTION from documents.conf.settings import UUID_FUNCTION diff --git a/apps/documents/views.py b/apps/documents/views.py index 1256c953d7..130fe77bb3 100644 --- a/apps/documents/views.py +++ b/apps/documents/views.py @@ -26,8 +26,6 @@ from converter.api import DEFAULT_ZOOM_LEVEL, DEFAULT_ROTATION, \ DEFAULT_FILE_FORMAT, QUALITY_PRINT from document_comments.utils import get_comments_subtemplate from filetransfers.api import serve_file -from grouping.models import DocumentGroup -from grouping import document_group_link from grouping.utils import get_document_group_subtemplate from metadata.api import save_metadata_list, \ decode_metadata_from_url, metadata_repr_as_list @@ -288,7 +286,7 @@ def document_view_simple(request, document_id): { 'name': 'generic_form_subtemplate.html', 'context': { - 'title':_(u'document properties'), + 'title': _(u'document properties'), 'form': content_form, 'object': document, }, diff --git a/apps/permissions/api.py b/apps/permissions/api.py index 9b1942a676..21e5dcda4a 100644 --- a/apps/permissions/api.py +++ b/apps/permissions/api.py @@ -1,8 +1,5 @@ -#from django.contrib.auth.models import User -#from django.contrib.auth.models import Group from django.db.utils import DatabaseError from django.shortcuts import get_object_or_404 -from django.contrib.contenttypes.models import ContentType from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext from django.core.exceptions import PermissionDenied @@ -11,7 +8,7 @@ from permissions import PERMISSION_ROLE_VIEW, PERMISSION_ROLE_EDIT, \ PERMISSION_ROLE_CREATE, PERMISSION_ROLE_DELETE, \ PERMISSION_PERMISSION_GRANT, PERMISSION_PERMISSION_REVOKE -from permissions.models import Permission, Role +from permissions.models import Permission def register_permissions(namespace, permissions): diff --git a/apps/permissions/models.py b/apps/permissions/models.py index f4be0c541d..6792bf36ed 100644 --- a/apps/permissions/models.py +++ b/apps/permissions/models.py @@ -2,7 +2,7 @@ from django.db import models from django.utils.translation import ugettext_lazy as _ from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes import generic -from django.contrib.auth.models import User, Group +from django.contrib.auth.models import User class PermissionManager(models.Manager):