From d1949746350d9b02013de668ad299d6d49a889e6 Mon Sep 17 00:00:00 2001 From: Corey Oordt Date: Tue, 6 Mar 2012 15:04:19 -0500 Subject: [PATCH 1/5] Removed an errant print statement --- categories/admin.py | 1 - 1 file changed, 1 deletion(-) diff --git a/categories/admin.py b/categories/admin.py index d8289c2..ef5d41a 100644 --- a/categories/admin.py +++ b/categories/admin.py @@ -77,7 +77,6 @@ for model, modeladmin in admin.site._registry.items(): fields.remove(cat) # if there are any fields left, add them under the categories fieldset if len(fields) > 0: - print fields admin.site.unregister(model) admin.site.register(model, type('newadmin', (modeladmin.__class__,), { 'fieldsets': fieldsets + (('Categories', { From f3cc72a76b1fe6a44eadaede03365808d98abe2c Mon Sep 17 00:00:00 2001 From: Corey Oordt Date: Tue, 6 Mar 2012 15:05:03 -0500 Subject: [PATCH 2/5] Fix for django 1.4 compatibility --- categories/editor/tree_editor.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/categories/editor/tree_editor.py b/categories/editor/tree_editor.py index ca3d047..1943ac6 100644 --- a/categories/editor/tree_editor.py +++ b/categories/editor/tree_editor.py @@ -136,11 +136,18 @@ class TreeEditor(admin.ModelAdmin): pass try: - cl = TreeChangeList(request, self.model, list_display, - self.list_display_links, self.list_filter, self.date_hierarchy, - self.search_fields, self.list_select_related, - self.list_per_page, self.list_max_show_all, - self.list_editable, self) + if django.VERSION[1] < 4: + params = (request, self.model, list_display, + self.list_display_links, self.list_filter, self.date_hierarchy, + self.search_fields, self.list_select_related, + self.list_per_page,self.list_editable, self) + else: + params = (request, self.model, list_display, + self.list_display_links, self.list_filter, self.date_hierarchy, + self.search_fields, self.list_select_related, + self.list_per_page, self.list_max_show_all, + self.list_editable, self) + cl = TreeChangeList(*params) except IncorrectLookupParameters: # Wacky lookup parameters were given, so redirect to the main # changelist page, without parameters, and pass an 'invalid=1' From 6ce2a49d2ed4074b24d4be56a578f7169354ed00 Mon Sep 17 00:00:00 2001 From: Corey Oordt Date: Tue, 6 Mar 2012 15:05:28 -0500 Subject: [PATCH 3/5] Fixed how the activate/deactivate methods in the admin fetched their models. --- categories/base.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/categories/base.py b/categories/base.py index e73e911..4d829a1 100644 --- a/categories/base.py +++ b/categories/base.py @@ -129,8 +129,7 @@ class CategoryBaseAdmin(TreeEditor, admin.ModelAdmin): """ Set active to False for selected items """ - opts = self._meta - selected_cats = opts.model.objects.filter( + selected_cats = self.model.objects.filter( pk__in=[int(x) for x in request.POST.getlist('_selected_action')]) for item in selected_cats: @@ -144,9 +143,7 @@ class CategoryBaseAdmin(TreeEditor, admin.ModelAdmin): """ Set active to True for selected items """ - opts = self._meta - - selected_cats = opts.model.objects.filter( + selected_cats = self.model.objects.filter( pk__in=[int(x) for x in request.POST.getlist('_selected_action')]) for item in selected_cats: From 79afb07ced024852f8e28310cadf8af04b6c4ca4 Mon Sep 17 00:00:00 2001 From: Corey Oordt Date: Tue, 6 Mar 2012 15:05:38 -0500 Subject: [PATCH 4/5] Version bump to 1.0.2 --- categories/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/categories/__init__.py b/categories/__init__.py index eb90b23..fae31c3 100644 --- a/categories/__init__.py +++ b/categories/__init__.py @@ -1,7 +1,7 @@ __version_info__ = { 'major': 1, 'minor': 0, - 'micro': 0, + 'micro': 1, 'releaselevel': 'final', 'serial': 1 } From fe20c70eb2ee08a2b536428b08a6c529054d2a5c Mon Sep 17 00:00:00 2001 From: Corey Oordt Date: Tue, 6 Mar 2012 15:06:55 -0500 Subject: [PATCH 5/5] Updating doc rendering to 1.0.2 --- docs/adding_the_fields.html | 8 ++++---- docs/custom_categories.html | 8 ++++---- docs/genindex.html | 8 ++++---- docs/getting_started.html | 8 ++++---- docs/index.html | 8 ++++---- docs/installation.html | 8 ++++---- docs/objects.inv | 12 +++++------- docs/reference/index.html | 8 ++++---- docs/reference/management_commands.html | 8 ++++---- docs/reference/models.html | 8 ++++---- docs/reference/settings.html | 8 ++++---- docs/reference/templatetags.html | 8 ++++---- docs/registering_models.html | 8 ++++---- docs/search.html | 8 ++++---- docs/searchindex.js | 2 +- docs/usage.html | 8 ++++---- 16 files changed, 62 insertions(+), 64 deletions(-) diff --git a/docs/adding_the_fields.html b/docs/adding_the_fields.html index c6b400d..6cae131 100644 --- a/docs/adding_the_fields.html +++ b/docs/adding_the_fields.html @@ -6,13 +6,13 @@ - Adding the fields to the database — Django Categories v1.0b2 documentation + Adding the fields to the database — Django Categories v1.0.1 documentation - +
-

Django Categories v1.0b2 documentation

+

Django Categories v1.0.1 documentation