PEP8 cleanups
This commit is contained in:
@@ -1,17 +1,12 @@
|
||||
from __future__ import absolute_import, unicode_literals
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import logging
|
||||
|
||||
from django.contrib.auth.models import User
|
||||
from django.contrib.contenttypes.models import ContentType
|
||||
from django.core.exceptions import PermissionDenied
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.db import models
|
||||
from django.db.models import Q
|
||||
from django.utils.translation import ugettext
|
||||
|
||||
from permissions import Permission
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@@ -38,7 +33,7 @@ class AccessControlListManager(models.Manager):
|
||||
if not self.filter(content_type=ContentType.objects.get_for_model(obj), object_id=obj.pk, permissions__in=stored_permissions, role__in=user_roles):
|
||||
raise PermissionDenied(ugettext('Insufficient access.'))
|
||||
|
||||
def filter_by_access(self, permission, user, queryset, exception_on_empty=False, related=None):
|
||||
def filter_by_access(self, permission, user, queryset, exception_on_empty=False, related=None):
|
||||
if user.is_superuser or user.is_staff:
|
||||
return queryset
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ from pytz import common_timezones
|
||||
from django.conf import settings
|
||||
from django.db import models
|
||||
from django.utils.encoding import python_2_unicode_compatible
|
||||
from django.utils.translation import ugettext_lazy as _, ugettext
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
from .runtime import shared_storage_backend
|
||||
|
||||
|
||||
@@ -63,7 +63,7 @@ def index_setup_create(request):
|
||||
if request.method == 'POST':
|
||||
form = IndexForm(request.POST)
|
||||
if form.is_valid():
|
||||
index = form.save()
|
||||
form.save()
|
||||
messages.success(request, _('Index created successfully.'))
|
||||
return HttpResponseRedirect(reverse('indexing:index_setup_list'))
|
||||
else:
|
||||
|
||||
@@ -167,7 +167,6 @@ class SearchModel(object):
|
||||
|
||||
elapsed_time = unicode(datetime.datetime.now() - start_time).split(':')[2]
|
||||
|
||||
#queryset = self.model.objects.in_bulk(list(result_set)[:setting_limit.value]).values()
|
||||
queryset = self.model.objects.filter(pk__in=list(result_set)[:setting_limit.value])
|
||||
|
||||
if self.permission:
|
||||
|
||||
@@ -10,7 +10,6 @@ from common import (
|
||||
menu_sidebar
|
||||
)
|
||||
from documents.models import Document
|
||||
from navigation import CombinedSource
|
||||
|
||||
from .links import (
|
||||
link_smart_link_create, link_smart_link_condition_create,
|
||||
|
||||
@@ -11,6 +11,7 @@ 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
|
||||
from documents.models import Document
|
||||
from documents.views import DocumentListView
|
||||
from documents.permissions import permission_document_view
|
||||
@@ -33,7 +34,7 @@ def tag_create(request):
|
||||
if request.method == 'POST':
|
||||
form = TagForm(request.POST)
|
||||
if form.is_valid():
|
||||
tag = form.save()
|
||||
form.save()
|
||||
|
||||
messages.success(request, _('Tag created succesfully.'))
|
||||
return HttpResponseRedirect(redirect_url)
|
||||
|
||||
Reference in New Issue
Block a user