Cleanups

mayan/apps/documents/views/document_views.py

@@ -147,7 +147,6 @@ class DocumentDocumentTypeEditView(MultipleObjectFormActionView):
         return result
 
     def get_form_extra_kwargs(self):
-        queryset = self.get_queryset()
         result = {
             'user': self.request.user
         }

mayan/apps/folders/forms.py

@@ -8,7 +8,6 @@ from django.utils.translation import ugettext_lazy as _
 from acls.models import AccessControlList
 
 from .models import Folder
-from .permissions import permission_folder_view
 
 logger = logging.getLogger(__name__)
 

mayan/apps/folders/links.py

@@ -19,8 +19,9 @@ link_document_folder_list = Link(
     args='resolved_object.pk'
 )
 link_document_folder_remove = Link(
-    args='resolved_object.pk', text=_('Remove from folders'),
+    args='resolved_object.pk',
-    view='folders:document_folder_remove'
+    permissions=(permission_folder_remove_document,),
+    text=_('Remove from folders'), view='folders:document_folder_remove'
 )
 link_folder_add_document = Link(
     permissions=(permission_folder_add_document,), text=_('Add to a folders'),

mayan/apps/folders/views.py

@@ -2,12 +2,9 @@ from __future__ import absolute_import, unicode_literals
 
 import logging
 
-from django.conf import settings
 from django.contrib import messages
-from django.core.urlresolvers import reverse, reverse_lazy
+from django.core.urlresolvers import reverse_lazy
-from django.http import HttpResponseRedirect
+from django.shortcuts import get_object_or_404
-from django.shortcuts import get_object_or_404, render_to_response
-from django.template import RequestContext
 from django.utils.translation import ugettext_lazy as _, ungettext
 
 from acls.models import AccessControlList