Skip to content

changes for django>=1.7 #10

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
nauman3128 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

changes for django>=1.7 #10

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion locking/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from django.conf.urls.defaults import *
from django.conf.urls import patterns

urlpatterns = patterns('locking.views',
# verwijst naar een ajax-view voor het lockingmechanisme
Expand Down
6 changes: 3 additions & 3 deletions locking/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import simplejson
import json

from django.http import HttpResponse
from django.conf import settings
Expand Down Expand Up @@ -65,7 +65,7 @@ def unlock(request, app, model, id):
def is_locked(request, app, model, id):
try:
obj = Lock.objects.get(entry_id=id, app=app, model=model)
response = simplejson.dumps({
response = json.dumps({
"is_active": obj.is_locked,
"for_user": getattr(obj.locked_by, 'username', None),
"applies": obj.lock_applies_to(request.user)
Expand All @@ -75,7 +75,7 @@ def is_locked(request, app, model, id):
return HttpResponse(status=200)
@log
def js_variables(request):
response = "var locking = " + simplejson.dumps({
response = "var locking = " + json.dumps({
'base_url': "/".join(request.path.split('/')[:-1]),
'timeout': LOCK_TIMEOUT,
'time_until_expiration': settings.LOCKING['time_until_expiration'],
Expand Down