From 60ac55bfd3d85a0c7a4dd8eff315da83c920bead Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 19 May 2014 16:19:55 -0400 Subject: [PATCH] PEP8 and simple cleanups --- apps/document_indexing/__init__.py | 10 +--------- apps/document_indexing/api.py | 6 +++--- apps/document_indexing/forms.py | 1 - apps/document_indexing/links.py | 2 ++ 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/apps/document_indexing/__init__.py b/apps/document_indexing/__init__.py index 16b085224a..0e432a160d 100644 --- a/apps/document_indexing/__init__.py +++ b/apps/document_indexing/__init__.py @@ -5,7 +5,6 @@ from django.dispatch import receiver from django.utils.translation import ugettext_lazy as _ from documents.models import Document -from documents.permissions import PERMISSION_DOCUMENT_VIEW from main.api import register_maintenance_links from metadata.models import DocumentMetadata from navigation.api import (register_top_menu, register_sidebar_template, @@ -15,16 +14,9 @@ from project_setup.api import register_setup from .api import update_indexes, delete_indexes from .links import (index_setup, index_setup_list, index_setup_create, index_setup_edit, index_setup_delete, index_setup_view, index_setup_document_types, template_node_create, - template_node_edit, template_node_delete, index_list, index_parent, document_index_list, + template_node_edit, template_node_delete, index_parent, document_index_list, rebuild_index_instances, document_index_main_menu_link) from .models import Index, IndexTemplateNode, IndexInstanceNode -from .permissions import (PERMISSION_DOCUMENT_INDEXING_VIEW, - PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES, - PERMISSION_DOCUMENT_INDEXING_SETUP, - PERMISSION_DOCUMENT_INDEXING_CREATE, - PERMISSION_DOCUMENT_INDEXING_EDIT, - PERMISSION_DOCUMENT_INDEXING_DELETE -) @receiver(pre_delete, dispatch_uid='document_index_delete', sender=Document) diff --git a/apps/document_indexing/api.py b/apps/document_indexing/api.py index 70a8bac727..039afdfc82 100644 --- a/apps/document_indexing/api.py +++ b/apps/document_indexing/api.py @@ -15,11 +15,11 @@ from .filesystem import (fs_create_index_directory, fs_delete_index_directory, assemble_suffixed_filename) from .models import Index, IndexInstanceNode, DocumentRenameCount -if SLUGIFY_PATHS == False: +if SLUGIFY_PATHS: + SLUGIFY_FUNCTION = slugify +else: # Do not slugify path or filenames and extensions SLUGIFY_FUNCTION = lambda x: x -else: - SLUGIFY_FUNCTION = slugify # External functions diff --git a/apps/document_indexing/forms.py b/apps/document_indexing/forms.py index 3def218a15..90b0e6b158 100644 --- a/apps/document_indexing/forms.py +++ b/apps/document_indexing/forms.py @@ -1,7 +1,6 @@ from __future__ import absolute_import from django import forms -from django.utils.translation import ugettext_lazy as _ from .models import Index, IndexTemplateNode diff --git a/apps/document_indexing/links.py b/apps/document_indexing/links.py index dde50b9fa8..23d8c77936 100644 --- a/apps/document_indexing/links.py +++ b/apps/document_indexing/links.py @@ -14,10 +14,12 @@ from .permissions import (PERMISSION_DOCUMENT_INDEXING_VIEW, def is_not_root_node(context): + # TODO: FIX: Check for parent node the proper way return context['node'].parent is not None def is_not_instance_root_node(context): + # TODO: FIX: Check for parent node the proper way return context['object'].parent is not None