From 8e4342da9ee35572652827f79d7b5b32391a75d1 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 13 Oct 2014 17:39:49 -0400 Subject: [PATCH] PEP8 cleanups --- mayan/apps/tags/__init__.py | 55 +++++++++++++++++++------------------ mayan/apps/tags/views.py | 18 ++++++------ 2 files changed, 38 insertions(+), 35 deletions(-) diff --git a/mayan/apps/tags/__init__.py b/mayan/apps/tags/__init__.py index d744f1796a..436c668c3d 100644 --- a/mayan/apps/tags/__init__.py +++ b/mayan/apps/tags/__init__.py @@ -8,19 +8,40 @@ from taggit.models import Tag from acls.api import class_permissions from common.utils import encapsulate from documents.models import Document -from navigation.api import (register_links, register_top_menu, - register_model_list_columns, register_multi_item_links) +from navigation.api import (register_links, register_model_list_columns, + register_multi_item_links, register_top_menu) from rest_api.classes import APIEndPoint -from .links import (tag_list, tag_create, tag_attach, - tag_document_list, tag_delete, tag_edit, tag_tagged_item_list, - tag_multiple_delete, tag_acl_list, tag_multiple_attach, - single_document_multiple_tag_remove, multiple_documents_selection_tag_remove) -from .permissions import (PERMISSION_TAG_ATTACH, PERMISSION_TAG_REMOVE, - PERMISSION_TAG_DELETE, PERMISSION_TAG_EDIT, PERMISSION_TAG_VIEW) +from .links import (multiple_documents_selection_tag_remove, + single_document_multiple_tag_remove, tag_acl_list, + tag_attach, tag_create, tag_delete, tag_document_list, + tag_edit, tag_list, tag_multiple_attach, + tag_multiple_delete, tag_tagged_item_list) +from .permissions import (PERMISSION_TAG_ATTACH, PERMISSION_TAG_DELETE, + PERMISSION_TAG_EDIT, PERMISSION_TAG_REMOVE, + PERMISSION_TAG_VIEW) from .urls import api_urls from .widgets import (get_tags_inline_widget_simple, single_tag_widget) + +def tag_documents(self): + return Document.objects.filter(tags__in=[self]) + + +Document.add_to_class('tags', TaggableManager()) +Tag.add_to_class('documents', property(tag_documents)) + +class_permissions(Document, [ + PERMISSION_TAG_ATTACH, PERMISSION_TAG_REMOVE, +]) +class_permissions(Tag, [ + PERMISSION_TAG_DELETE, PERMISSION_TAG_EDIT, PERMISSION_TAG_VIEW, +]) + +endpoint = APIEndPoint('tags') +endpoint.register_urls(api_urls) +endpoint.add_endpoint('tag-list', _(u'Returns a list of all the tags.')) + register_model_list_columns(Tag, [ { 'name': _(u'Preview'), @@ -49,21 +70,3 @@ register_links(['tags:document_tags', 'tags:tag_remove', 'tag_multiple_remove', register_multi_item_links(['document_tags'], [single_document_multiple_tag_remove]) register_multi_item_links(['documents:document_find_duplicates', 'folders:folder_view', 'indexes:index_instance_node_view', 'documents:document_type_document_list', 'search:search', 'search:results', 'linking:document_group_view', 'documents:document_list', 'documents:document_list_recent', 'tags:tag_tagged_item_list'], [tag_multiple_attach, multiple_documents_selection_tag_remove]) - -class_permissions(Document, [ - PERMISSION_TAG_ATTACH, PERMISSION_TAG_REMOVE, -]) - -class_permissions(Tag, [ - PERMISSION_TAG_DELETE, PERMISSION_TAG_EDIT, PERMISSION_TAG_VIEW, -]) - -def tag_documents(self): - return Document.objects.filter(tags__in=[self]) - -Document.add_to_class('tags', TaggableManager()) -Tag.add_to_class('documents', property(tag_documents)) - -endpoint = APIEndPoint('tags') -endpoint.register_urls(api_urls) -endpoint.add_endpoint('tag-list', _(u'Returns a list of all the tags.')) diff --git a/mayan/apps/tags/views.py b/mayan/apps/tags/views.py index 7b512a642e..5bb500138f 100644 --- a/mayan/apps/tags/views.py +++ b/mayan/apps/tags/views.py @@ -7,7 +7,7 @@ from django.core.exceptions import PermissionDenied from django.core.urlresolvers import reverse from django.conf import settings from django.http import HttpResponseRedirect -from django.shortcuts import render_to_response, 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 _ @@ -21,11 +21,11 @@ from documents.views import DocumentListView from documents.permissions import PERMISSION_DOCUMENT_VIEW from permissions.models import Permission -from .forms import TagListForm, TagForm +from .forms import TagForm, TagListForm from .models import TagProperties -from .permissions import (PERMISSION_TAG_CREATE, PERMISSION_TAG_ATTACH, - PERMISSION_TAG_REMOVE, PERMISSION_TAG_DELETE, PERMISSION_TAG_EDIT, - PERMISSION_TAG_VIEW) +from .permissions import (PERMISSION_TAG_ATTACH, PERMISSION_TAG_CREATE, + PERMISSION_TAG_DELETE, PERMISSION_TAG_EDIT, + PERMISSION_TAG_REMOVE, PERMISSION_TAG_VIEW) logger = logging.getLogger(__name__) @@ -111,7 +111,7 @@ def tag_attach(request, document_id=None, document_id_list=None): context['title'] = _(u'Attach tag to documents: %s.') % ', '.join([unicode(d) for d in documents]) return render_to_response('main/generic_form.html', context, - context_instance=RequestContext(request)) + context_instance=RequestContext(request)) def tag_multiple_attach(request): @@ -140,7 +140,7 @@ def tag_list(request, queryset=None, extra_context=None): context['object_list'] = queryset return render_to_response('main/generic_list.html', context, - context_instance=RequestContext(request)) + context_instance=RequestContext(request)) def tag_delete(request, tag_id=None, tag_id_list=None): @@ -191,7 +191,7 @@ def tag_delete(request, tag_id=None, tag_id_list=None): context['message'] = _('Will be removed from all documents.') return render_to_response('main/generic_confirm.html', context, - context_instance=RequestContext(request)) + context_instance=RequestContext(request)) def tag_multiple_delete(request): @@ -349,7 +349,7 @@ def tag_remove(request, document_id=None, document_id_list=None, tag_id=None, ta return HttpResponseRedirect(next) else: return render_to_response(template, context, - context_instance=RequestContext(request)) + context_instance=RequestContext(request)) def single_document_multiple_tag_remove(request, document_id):