diff --git a/categories/__init__.py b/categories/__init__.py index 1f2992c..01a1451 100644 --- a/categories/__init__.py +++ b/categories/__init__.py @@ -16,6 +16,7 @@ def get_version(short=False): vers.append('%s%i' % (__version_info__['releaselevel'][0], __version_info__['serial'])) return ''.join(vers) + __version__ = get_version() @@ -27,6 +28,8 @@ def register(): from categories.registration import (_process_registry, registry) _process_registry(settings.FK_REGISTRY, registry.register_fk) _process_registry(settings.M2M_REGISTRY, registry.register_m2m) + + try: register() except Exception as e: diff --git a/categories/admin.py b/categories/admin.py index 1789150..5c0eaba 100644 --- a/categories/admin.py +++ b/categories/admin.py @@ -22,6 +22,7 @@ class NullTreeNodeChoiceField(forms.ModelChoiceField): """ return '%s %s' % (self.level_indicator * getattr(obj, obj._mptt_meta.level_attr), obj) + if RELATION_MODELS: from .models import CategoryRelation @@ -65,6 +66,7 @@ class CategoryAdmin(CategoryBaseAdmin): class Media: js = (JAVASCRIPT_URL + 'genericcollections.js',) + if REGISTER_ADMIN: admin.site.register(Category, CategoryAdmin) diff --git a/categories/editor/templatetags/admin_tree_list_tags.py b/categories/editor/templatetags/admin_tree_list_tags.py index b4a6482..c3bba24 100644 --- a/categories/editor/templatetags/admin_tree_list_tags.py +++ b/categories/editor/templatetags/admin_tree_list_tags.py @@ -173,4 +173,6 @@ def result_tree_list(cl): from django.contrib.admin.templatetags.admin_list import result_hidden_fields result['result_hidden_fields'] = list(result_hidden_fields(cl)) return result + + result_tree_list = register.inclusion_tag(TREE_LIST_RESULTS_TEMPLATE)(result_tree_list) diff --git a/categories/fields.py b/categories/fields.py index 4278ef7..c7418b5 100644 --- a/categories/fields.py +++ b/categories/fields.py @@ -16,6 +16,7 @@ class CategoryFKField(ForeignKey): kwargs.pop('to') super(CategoryFKField, self).__init__(to=Category, **kwargs) + try: from south.modelsinspector import add_introspection_rules add_introspection_rules([], ["^categories\.fields\.CategoryFKField"]) diff --git a/categories/models.py b/categories/models.py index a10675c..3c16ca2 100644 --- a/categories/models.py +++ b/categories/models.py @@ -144,6 +144,7 @@ class CategoryRelation(models.Model): def __unicode__(self): return "CategoryRelation" + try: from south.db import db # noqa, South is required for migrating. Need to check for it from django.db.models.signals import post_syncdb diff --git a/categories/registration.py b/categories/registration.py index 5eb8105..04cbb13 100644 --- a/categories/registration.py +++ b/categories/registration.py @@ -110,6 +110,7 @@ class Registry(object): self._field_registry[registry_name] = field(**extra_params) self._field_registry[registry_name].contribute_to_class(model, field_name) + registry = Registry() diff --git a/categories/templatetags/category_tags.py b/categories/templatetags/category_tags.py index 1db869f..83bc42d 100644 --- a/categories/templatetags/category_tags.py +++ b/categories/templatetags/category_tags.py @@ -338,6 +338,7 @@ def do_get_latest_objects_by_category(parser, token): num = FilterExpression(None, parser) return LatestObjectsNode(var_name, category, app_label, model_name, set_name, date_field, num) + register.tag("get_latest_objects_by_category", do_get_latest_objects_by_category) diff --git a/doc_src/code_examples/custom_categories2.py b/doc_src/code_examples/custom_categories2.py index 53cf264..9e63168 100644 --- a/doc_src/code_examples/custom_categories2.py +++ b/doc_src/code_examples/custom_categories2.py @@ -8,4 +8,5 @@ from .models import SimpleCategory class SimpleCategoryAdmin(CategoryBaseAdmin): pass + admin.site.register(SimpleCategory, SimpleCategoryAdmin) diff --git a/example/simpletext/admin.py b/example/simpletext/admin.py index 573370d..dcf1947 100644 --- a/example/simpletext/admin.py +++ b/example/simpletext/admin.py @@ -21,5 +21,6 @@ class SimpleCategoryAdminForm(CategoryBaseAdminForm): class SimpleCategoryAdmin(CategoryBaseAdmin): form = SimpleCategoryAdminForm + admin.site.register(SimpleText, SimpleTextAdmin) admin.site.register(SimpleCategory, SimpleCategoryAdmin) diff --git a/example/simpletext/tests.py b/example/simpletext/tests.py index f54e74f..73d6465 100755 --- a/example/simpletext/tests.py +++ b/example/simpletext/tests.py @@ -15,6 +15,7 @@ class SimpleTest(TestCase): """ self.assertEqual(1 + 1, 2) + __test__ = {"doctest": """ Another way to test that 1 + 1 is equal to 2.