diff --git a/mayan/apps/folders/forms.py b/mayan/apps/folders/forms.py index d76da47f3d..09e14ee549 100644 --- a/mayan/apps/folders/forms.py +++ b/mayan/apps/folders/forms.py @@ -3,8 +3,8 @@ from __future__ import absolute_import import logging from django import forms -from django.utils.translation import ugettext_lazy as _ from django.core.exceptions import PermissionDenied +from django.utils.translation import ugettext_lazy as _ from acls.models import AccessEntry from permissions.models import Permission diff --git a/mayan/apps/folders/registry.py b/mayan/apps/folders/registry.py index 520ea4d909..53de56453d 100644 --- a/mayan/apps/folders/registry.py +++ b/mayan/apps/folders/registry.py @@ -2,5 +2,4 @@ from __future__ import absolute_import from .cleanup import cleanup - cleanup_functions = [cleanup] diff --git a/mayan/apps/folders/views.py b/mayan/apps/folders/views.py index 2936cca4b0..5c6e9d8a90 100644 --- a/mayan/apps/folders/views.py +++ b/mayan/apps/folders/views.py @@ -2,25 +2,25 @@ from __future__ import absolute_import import logging -from django.utils.translation import ugettext_lazy as _ +from django.contrib import messages +from django.core.exceptions import PermissionDenied +from django.core.urlresolvers import reverse from django.http import HttpResponseRedirect from django.shortcuts import render_to_response, get_object_or_404 from django.template import RequestContext -from django.contrib import messages -from django.core.urlresolvers import reverse -from django.core.exceptions import PermissionDenied +from django.utils.translation import ugettext_lazy as _ +from acls.models import AccessEntry +from acls.utils import apply_default_acls +from acls.views import acl_list_for +from common.utils import encapsulate from documents.permissions import PERMISSION_DOCUMENT_VIEW from documents.models import Document from documents.views import document_list from permissions.models import Permission -from common.utils import encapsulate -from acls.models import AccessEntry -from acls.views import acl_list_for -from acls.utils import apply_default_acls -from .models import Folder from .forms import FolderForm, FolderListForm +from .models import Folder from .permissions import (PERMISSION_FOLDER_CREATE, PERMISSION_FOLDER_EDIT, PERMISSION_FOLDER_DELETE, PERMISSION_FOLDER_REMOVE_DOCUMENT, PERMISSION_FOLDER_VIEW,