Removed ununsed import, and did other cleanups
This commit is contained in:
@@ -2,14 +2,10 @@ from django import forms
|
|||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from django.utils.translation import ugettext
|
from django.utils.translation import ugettext
|
||||||
from django.http import HttpResponseRedirect
|
from django.http import HttpResponseRedirect
|
||||||
from django.utils.http import urlencode
|
|
||||||
from django.core.urlresolvers import reverse
|
from django.core.urlresolvers import reverse
|
||||||
from django.utils.safestring import mark_safe
|
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 django.conf import settings
|
||||||
|
|
||||||
from tags.widgets import get_tags_inline_widget
|
|
||||||
from common.wizard import BoundFormWizard
|
from common.wizard import BoundFormWizard
|
||||||
from common.forms import DetailForm
|
from common.forms import DetailForm
|
||||||
from common.literals import PAGE_SIZE_CHOICES, PAGE_ORIENTATION_CHOICES
|
from common.literals import PAGE_SIZE_CHOICES, PAGE_ORIENTATION_CHOICES
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import tempfile
|
|||||||
|
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from django.db.models import Q
|
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.contrib.contenttypes import generic
|
from django.contrib.contenttypes import generic
|
||||||
from django.contrib.comments.models import Comment
|
from django.contrib.comments.models import Comment
|
||||||
@@ -15,7 +14,6 @@ from taggit.managers import TaggableManager
|
|||||||
from dynamic_search.api import register
|
from dynamic_search.api import register
|
||||||
from converter.api import get_page_count
|
from converter.api import get_page_count
|
||||||
from converter import TRANFORMATION_CHOICES
|
from converter import TRANFORMATION_CHOICES
|
||||||
from metadata.classes import MetadataObject
|
|
||||||
|
|
||||||
from documents.conf.settings import CHECKSUM_FUNCTION
|
from documents.conf.settings import CHECKSUM_FUNCTION
|
||||||
from documents.conf.settings import UUID_FUNCTION
|
from documents.conf.settings import UUID_FUNCTION
|
||||||
|
|||||||
@@ -26,8 +26,6 @@ from converter.api import DEFAULT_ZOOM_LEVEL, DEFAULT_ROTATION, \
|
|||||||
DEFAULT_FILE_FORMAT, QUALITY_PRINT
|
DEFAULT_FILE_FORMAT, QUALITY_PRINT
|
||||||
from document_comments.utils import get_comments_subtemplate
|
from document_comments.utils import get_comments_subtemplate
|
||||||
from filetransfers.api import serve_file
|
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 grouping.utils import get_document_group_subtemplate
|
||||||
from metadata.api import save_metadata_list, \
|
from metadata.api import save_metadata_list, \
|
||||||
decode_metadata_from_url, metadata_repr_as_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',
|
'name': 'generic_form_subtemplate.html',
|
||||||
'context': {
|
'context': {
|
||||||
'title':_(u'document properties'),
|
'title': _(u'document properties'),
|
||||||
'form': content_form,
|
'form': content_form,
|
||||||
'object': document,
|
'object': document,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -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.db.utils import DatabaseError
|
||||||
from django.shortcuts import get_object_or_404
|
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_lazy as _
|
||||||
from django.utils.translation import ugettext
|
from django.utils.translation import ugettext
|
||||||
from django.core.exceptions import PermissionDenied
|
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_ROLE_CREATE, PERMISSION_ROLE_DELETE, \
|
||||||
PERMISSION_PERMISSION_GRANT, PERMISSION_PERMISSION_REVOKE
|
PERMISSION_PERMISSION_GRANT, PERMISSION_PERMISSION_REVOKE
|
||||||
|
|
||||||
from permissions.models import Permission, Role
|
from permissions.models import Permission
|
||||||
|
|
||||||
|
|
||||||
def register_permissions(namespace, permissions):
|
def register_permissions(namespace, permissions):
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ from django.db import models
|
|||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from django.contrib.contenttypes.models import ContentType
|
from django.contrib.contenttypes.models import ContentType
|
||||||
from django.contrib.contenttypes import generic
|
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):
|
class PermissionManager(models.Manager):
|
||||||
|
|||||||
Reference in New Issue
Block a user