Skip to content

for Django 1.8: fixed errors from deprecated simplejson and get_change_permission #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danyalette wants to merge 1 commit into
base: master
Choose a base branch
from
Open

for Django 1.8: fixed errors from deprecated simplejson and get_change_permission #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions treeadmin/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
from django.conf import settings as django_settings
from django.contrib import admin
from django.contrib.admin.views import main
from django.contrib import auth
from django.db.models import Q
from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseForbidden, HttpResponseNotFound, HttpResponseServerError
from django.utils import simplejson
import json
from django.utils.safestring import mark_safe
from django.utils.translation import ugettext_lazy as _, ugettext

Expand Down Expand Up @@ -146,7 +147,7 @@ def get_results(self, request):
super(ChangeList, self).get_results(request)

opts = self.model_admin.opts
label = opts.app_label + '.' + opts.get_change_permission()
label = opts.app_label + '.' + auth.get_permission_codename("change",opts)
for item in self.result_list:
if self.model_admin.enable_object_permissions:
item.feincms_editable = self.model_admin.has_change_permission(request, item)
Expand Down Expand Up @@ -318,7 +319,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
Expand Down Expand Up @@ -347,7 +348,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)
Expand All @@ -359,7 +360,7 @@ def has_change_permission(self, request, obj=None):
"""
if self.enable_object_permissions:
opts = self.opts
r = request.user.has_perm(opts.app_label + '.' + opts.get_change_permission(), obj)
r = request.user.has_perm(opts.app_label + '.' + auth.get_permission_codename("change",opts), obj)
else:
r = True

Expand Down