From 446c3d170e76b1fb586111104daee556e4d85f33 Mon Sep 17 00:00:00 2001 From: Guglielmo Date: Wed, 9 Apr 2014 12:07:08 +0200 Subject: [PATCH 1/3] Update admin.py --- treeadmin/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/treeadmin/admin.py b/treeadmin/admin.py index 1b31089..f415344 100644 --- a/treeadmin/admin.py +++ b/treeadmin/admin.py @@ -3,12 +3,12 @@ from django.contrib.admin.views import main from django.db.models import Q from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseForbidden, HttpResponseNotFound, HttpResponseServerError -from django.utils import simplejson from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _, ugettext from mptt.exceptions import InvalidMove +import json import logging From 9a6e6b4f3de38512552aeb0c09db5e5c86b0f19d Mon Sep 17 00:00:00 2001 From: Guglielmo Date: Thu, 24 Apr 2014 19:53:17 +0200 Subject: [PATCH 2/3] trap simplejson import errors --- treeadmin/admin.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/treeadmin/admin.py b/treeadmin/admin.py index f415344..0fd1d6f 100644 --- a/treeadmin/admin.py +++ b/treeadmin/admin.py @@ -7,8 +7,10 @@ from django.utils.translation import ugettext_lazy as _, ugettext from mptt.exceptions import InvalidMove - -import json +try: + import simpljson as json +except ImportError: + import json import logging From 7c4b881cec29bfbfe5f6d00c7aed3bd20ca82513 Mon Sep 17 00:00:00 2001 From: Guglielmo Date: Thu, 24 Apr 2014 19:57:34 +0200 Subject: [PATCH 3/3] simplejson/json import corrected --- treeadmin/admin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/treeadmin/admin.py b/treeadmin/admin.py index 0fd1d6f..4ba3320 100644 --- a/treeadmin/admin.py +++ b/treeadmin/admin.py @@ -320,7 +320,7 @@ def _toggle_boolean(self, request): d.append(b) # TODO: Shorter: [ y for x,y in zip(a,b) if x!=y ] - return HttpResponse(simplejson.dumps(d), mimetype="application/json") + return HttpResponse(json.dumps(d), mimetype="application/json") def get_changelist(self, request, **kwargs): return ChangeList @@ -349,7 +349,7 @@ def changelist_view(self, request, extra_context=None, *args, **kwargs): extra_context = extra_context or {} extra_context['TREEADMIN_MEDIA_HOTLINKING'] = self.jquery_use_google_cdn extra_context['TREEADMIN_JQUERY_NO_CONFLICT'] = self.jquery_no_conflict - extra_context['tree_structure'] = mark_safe(simplejson.dumps( + extra_context['tree_structure'] = mark_safe(json.dumps( _build_tree_structure(self.model))) return super(TreeAdmin, self).changelist_view(request, extra_context, *args, **kwargs)