From 7bdfb32474ca01c17738a53ac47f32fa52131480 Mon Sep 17 00:00:00 2001 From: Corey Oordt Date: Tue, 2 Aug 2011 10:54:35 -0400 Subject: [PATCH] Added a setting for the JAVASCRIPT_URL to make placement of the genericcollections.js file easier --- categories/admin.py | 4 ++-- categories/settings.py | 1 + doc_src/reference/settings.rst | 9 ++++++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/categories/admin.py b/categories/admin.py index 933e712..9e44eb3 100644 --- a/categories/admin.py +++ b/categories/admin.py @@ -7,7 +7,7 @@ from mptt.forms import TreeNodeChoiceField from editor.tree_editor import TreeEditor from genericcollection import GenericCollectionTabularInline -from settings import ALLOW_SLUG_CHANGE, RELATION_MODELS +from settings import ALLOW_SLUG_CHANGE, RELATION_MODELS, JAVASCRIPT_URL from categories import model_registry from models import Category @@ -97,7 +97,7 @@ class CategoryAdmin(TreeEditor, admin.ModelAdmin): inlines = [InlineCategoryRelation,] class Media: - js = (settings.STATIC_URL + 'js/genericcollections.js',) + js = (JAVASCRIPT_URL + 'genericcollections.js',) admin.site.register(Category, CategoryAdmin) diff --git a/categories/settings.py b/categories/settings.py index 33e7bbf..0f8678a 100644 --- a/categories/settings.py +++ b/categories/settings.py @@ -11,6 +11,7 @@ DEFAULT_SETTINGS = { 'FK_REGISTRY': {}, 'THUMBNAIL_UPLOAD_PATH': 'uploads/categories/thumbnails', 'THUMBNAIL_STORAGE': settings.DEFAULT_FILE_STORAGE, + 'JAVASCRIPT_URL': getattr(settings, 'STATIC_URL', settings.MEDIA_URL) + 'js/', } DEFAULT_SETTINGS.update(getattr(settings, 'CATEGORIES_SETTINGS', {})) diff --git a/doc_src/reference/settings.rst b/doc_src/reference/settings.rst index 1ed70f9..94f1ac3 100644 --- a/doc_src/reference/settings.rst +++ b/doc_src/reference/settings.rst @@ -67,4 +67,11 @@ THUMBNAIL_STORAGE **Default:** ``settings.DEFAULT_FILE_STORAGE`` -**Description:** How to store the thumbnails. Allows for external storage engines like S3. \ No newline at end of file +**Description:** How to store the thumbnails. Allows for external storage engines like S3. + +JAVASCRIPT_URL +============== + +**Default:** ``STATIC_URL or MEDIA_URL + 'js/'`` + +**Description:** Allows for customization of javascript placement. \ No newline at end of file