From 07f698c63803a724f5c9f75a80943198ff682f23 Mon Sep 17 00:00:00 2001 From: Jose Soares Date: Wed, 11 Jan 2012 15:22:29 -0500 Subject: [PATCH] Moved the editor app so its inside the categories app --- README.rst | 15 +++++++++++++++ categories/__init__.py | 2 +- categories/admin.py | 7 ++++--- {editor => categories/editor}/__init__.py | 0 {editor => categories/editor}/models.py | 0 {editor => categories/editor}/settings.py | 0 .../editor}/static/editor/jquery.treeTable.css | 0 .../editor}/static/editor/jquery.treeTable.js | 0 .../static/editor/toggle-collapse-dark.png | Bin .../static/editor/toggle-collapse-light.png | Bin .../editor}/static/editor/toggle-expand-dark.png | Bin .../static/editor/toggle-expand-light.png | Bin .../templates/admin/editor/tree_editor.html | 0 .../admin/editor/tree_list_results.html | 0 .../editor}/templatetags/__init__.py | 0 .../editor}/templatetags/admin_tree_list.py | 2 +- {editor => categories/editor}/tree_editor.py | 0 {editor => categories/editor}/utils.py | 0 categories/fields.py | 4 +--- categories/migration.py | 4 ++-- categories/models.py | 2 +- categories/urls.py | 2 +- categories/views.py | 4 ++-- doc_src/installation.rst | 2 +- example/settings.py | 2 +- 25 files changed, 30 insertions(+), 16 deletions(-) rename {editor => categories/editor}/__init__.py (100%) rename {editor => categories/editor}/models.py (100%) rename {editor => categories/editor}/settings.py (100%) rename {editor => categories/editor}/static/editor/jquery.treeTable.css (100%) rename {editor => categories/editor}/static/editor/jquery.treeTable.js (100%) rename {editor => categories/editor}/static/editor/toggle-collapse-dark.png (100%) rename {editor => categories/editor}/static/editor/toggle-collapse-light.png (100%) rename {editor => categories/editor}/static/editor/toggle-expand-dark.png (100%) rename {editor => categories/editor}/static/editor/toggle-expand-light.png (100%) rename {editor => categories/editor}/templates/admin/editor/tree_editor.html (100%) rename {editor => categories/editor}/templates/admin/editor/tree_list_results.html (100%) rename {editor => categories/editor}/templatetags/__init__.py (100%) rename {editor => categories/editor}/templatetags/admin_tree_list.py (98%) rename {editor => categories/editor}/tree_editor.py (100%) rename {editor => categories/editor}/utils.py (100%) diff --git a/README.rst b/README.rst index ff1d24b..59d9bcd 100644 --- a/README.rst +++ b/README.rst @@ -2,6 +2,21 @@ Django Categories grew out of our need to provide a basic hierarchical taxonomy As a news site, our stories, photos, and other content get divided into "sections" and we wanted all the apps to use the same set of sections. As our needs grew, the Django Categories grew in the functionality it gave to category handling within web pages. +Updated in 0.8.8 +================ + +The `editor` app was placed inside the categories app, `categories.editor`, to avoid any name clashes. + +Upgrading +--------- + +A setting change is all that is needed:: + + INSTALLED_APPS = ( + 'categories', + 'categories.editor', + ) + New in 0.8 ========== diff --git a/categories/__init__.py b/categories/__init__.py index c0553cd..08998ec 100644 --- a/categories/__init__.py +++ b/categories/__init__.py @@ -1,7 +1,7 @@ __version_info__ = { 'major': 0, 'minor': 8, - 'micro': 7, + 'micro': 8, 'releaselevel': 'final', 'serial': 1 } diff --git a/categories/admin.py b/categories/admin.py index f8657ed..6358249 100644 --- a/categories/admin.py +++ b/categories/admin.py @@ -2,12 +2,13 @@ from django.contrib import admin from django import forms from django.template.defaultfilters import slugify -from editor.tree_editor import TreeEditor from genericcollection import GenericCollectionTabularInline -from settings import ALLOW_SLUG_CHANGE, RELATION_MODELS, JAVASCRIPT_URL +from .settings import ALLOW_SLUG_CHANGE, RELATION_MODELS, JAVASCRIPT_URL +from .editor.tree_editor import TreeEditor +from .models import Category from categories import model_registry -from models import Category + class NullTreeNodeChoiceField(forms.ModelChoiceField): """A ModelChoiceField for tree nodes.""" diff --git a/editor/__init__.py b/categories/editor/__init__.py similarity index 100% rename from editor/__init__.py rename to categories/editor/__init__.py diff --git a/editor/models.py b/categories/editor/models.py similarity index 100% rename from editor/models.py rename to categories/editor/models.py diff --git a/editor/settings.py b/categories/editor/settings.py similarity index 100% rename from editor/settings.py rename to categories/editor/settings.py diff --git a/editor/static/editor/jquery.treeTable.css b/categories/editor/static/editor/jquery.treeTable.css similarity index 100% rename from editor/static/editor/jquery.treeTable.css rename to categories/editor/static/editor/jquery.treeTable.css diff --git a/editor/static/editor/jquery.treeTable.js b/categories/editor/static/editor/jquery.treeTable.js similarity index 100% rename from editor/static/editor/jquery.treeTable.js rename to categories/editor/static/editor/jquery.treeTable.js diff --git a/editor/static/editor/toggle-collapse-dark.png b/categories/editor/static/editor/toggle-collapse-dark.png similarity index 100% rename from editor/static/editor/toggle-collapse-dark.png rename to categories/editor/static/editor/toggle-collapse-dark.png diff --git a/editor/static/editor/toggle-collapse-light.png b/categories/editor/static/editor/toggle-collapse-light.png similarity index 100% rename from editor/static/editor/toggle-collapse-light.png rename to categories/editor/static/editor/toggle-collapse-light.png diff --git a/editor/static/editor/toggle-expand-dark.png b/categories/editor/static/editor/toggle-expand-dark.png similarity index 100% rename from editor/static/editor/toggle-expand-dark.png rename to categories/editor/static/editor/toggle-expand-dark.png diff --git a/editor/static/editor/toggle-expand-light.png b/categories/editor/static/editor/toggle-expand-light.png similarity index 100% rename from editor/static/editor/toggle-expand-light.png rename to categories/editor/static/editor/toggle-expand-light.png diff --git a/editor/templates/admin/editor/tree_editor.html b/categories/editor/templates/admin/editor/tree_editor.html similarity index 100% rename from editor/templates/admin/editor/tree_editor.html rename to categories/editor/templates/admin/editor/tree_editor.html diff --git a/editor/templates/admin/editor/tree_list_results.html b/categories/editor/templates/admin/editor/tree_list_results.html similarity index 100% rename from editor/templates/admin/editor/tree_list_results.html rename to categories/editor/templates/admin/editor/tree_list_results.html diff --git a/editor/templatetags/__init__.py b/categories/editor/templatetags/__init__.py similarity index 100% rename from editor/templatetags/__init__.py rename to categories/editor/templatetags/__init__.py diff --git a/editor/templatetags/admin_tree_list.py b/categories/editor/templatetags/admin_tree_list.py similarity index 98% rename from editor/templatetags/admin_tree_list.py rename to categories/editor/templatetags/admin_tree_list.py index c7e82fd..cd20256 100644 --- a/editor/templatetags/admin_tree_list.py +++ b/categories/editor/templatetags/admin_tree_list.py @@ -4,7 +4,7 @@ from django.contrib.admin.templatetags.admin_list import result_headers try: from django.contrib.admin.util import lookup_field, display_for_field, label_for_field except ImportError: - from editor.utils import lookup_field, display_for_field, label_for_field + from categories.editor.utils import lookup_field, display_for_field, label_for_field from django.contrib.admin.views.main import EMPTY_CHANGELIST_VALUE from django.core.exceptions import ObjectDoesNotExist from django.utils.encoding import smart_unicode, force_unicode diff --git a/editor/tree_editor.py b/categories/editor/tree_editor.py similarity index 100% rename from editor/tree_editor.py rename to categories/editor/tree_editor.py diff --git a/editor/utils.py b/categories/editor/utils.py similarity index 100% rename from editor/utils.py rename to categories/editor/utils.py diff --git a/categories/fields.py b/categories/fields.py index 4941722..6c815a9 100644 --- a/categories/fields.py +++ b/categories/fields.py @@ -1,8 +1,6 @@ from django.db.models import ForeignKey, ManyToManyField -from categories.models import Category - - +from .models import Category class CategoryM2MField(ManyToManyField): def __init__(self, **kwargs): diff --git a/categories/migration.py b/categories/migration.py index dc69e70..0827356 100644 --- a/categories/migration.py +++ b/categories/migration.py @@ -2,8 +2,8 @@ from django.db import models, DatabaseError from south.db import db from south.signals import post_migrate -from categories.fields import CategoryM2MField, CategoryFKField -from categories.models import Category +from .fields import CategoryM2MField, CategoryFKField +from .models import Category from categories import model_registry, field_registry def migrate_app(app, *args, **kwargs): diff --git a/categories/models.py b/categories/models.py index ed62c52..243cae5 100644 --- a/categories/models.py +++ b/categories/models.py @@ -9,7 +9,7 @@ from django.utils.translation import ugettext as _ from mptt.models import MPTTModel -from settings import (RELATION_MODELS, RELATIONS, THUMBNAIL_UPLOAD_PATH, +from .settings import (RELATION_MODELS, RELATIONS, THUMBNAIL_UPLOAD_PATH, THUMBNAIL_STORAGE) STORAGE = get_storage_class(THUMBNAIL_STORAGE) diff --git a/categories/urls.py b/categories/urls.py index d8957a7..e954df7 100644 --- a/categories/urls.py +++ b/categories/urls.py @@ -1,5 +1,5 @@ from django.conf.urls.defaults import * -from categories.models import Category +from .models import Category categorytree_dict = { 'queryset': Category.objects.filter(level=0) diff --git a/categories/views.py b/categories/views.py index ec6aefd..61c45e1 100644 --- a/categories/views.py +++ b/categories/views.py @@ -7,8 +7,8 @@ from django.views.decorators.cache import cache_page from django.template.loader import select_template from django.utils.translation import ugettext as _ -from categories.models import Category -from settings import CACHE_VIEW_LENGTH +from .models import Category +from .settings import CACHE_VIEW_LENGTH @cache_page(CACHE_VIEW_LENGTH) def category_detail(request, path, diff --git a/doc_src/installation.rst b/doc_src/installation.rst index 5e66eaa..fe0be2d 100644 --- a/doc_src/installation.rst +++ b/doc_src/installation.rst @@ -13,7 +13,7 @@ Installation INSTALLED_APPS = [ # ... "categories", - "editor", + "categories.editor", ] 3. Run ``./manage.py syncdb`` (or ``./manage.py migrate categories`` if you are using `South `_) diff --git a/example/settings.py b/example/settings.py index c5f7d27..9efef90 100644 --- a/example/settings.py +++ b/example/settings.py @@ -116,7 +116,7 @@ INSTALLED_APPS = ( 'django.contrib.staticfiles', 'django.contrib.flatpages', 'categories', - 'editor', + 'categories.editor', 'mptt', 'simpletext', 'south',