fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Wide PDF covers.
[wolnelektury.git]
/
apps
/
ajaxable
/
utils.py
diff --git
a/apps/ajaxable/utils.py
b/apps/ajaxable/utils.py
index
2f03309
..
4a80120
100755
(executable)
--- a/
apps/ajaxable/utils.py
+++ b/
apps/ajaxable/utils.py
@@
-1,3
+1,7
@@
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#
from functools import wraps
from django.http import (HttpResponse, HttpResponseRedirect,
from functools import wraps
from django.http import (HttpResponse, HttpResponseRedirect,
@@
-26,7
+30,7
@@
class JSONResponse(HttpResponse):
kwargs.pop('mimetype', None)
data = json.dumps(data)
if callback:
kwargs.pop('mimetype', None)
data = json.dumps(data)
if callback:
- data = callback + "(" + data + ");"
+ data = callback + "(" + data + ");"
super(JSONResponse, self).__init__(data, mimetype="application/json", **kwargs)
super(JSONResponse, self).__init__(data, mimetype="application/json", **kwargs)
@@
-70,7
+74,7
@@
class AjaxableFormView(object):
# override to customize form look
template = "ajaxable/form.html"
submit = _('Send')
# override to customize form look
template = "ajaxable/form.html"
submit = _('Send')
-
+
title = ''
success_message = ''
POST_login = False
title = ''
success_message = ''
POST_login = False
@@
-102,7
+106,7
@@
class AjaxableFormView(object):
if form.is_valid():
add_args = self.success(form, request)
response_data = {
if form.is_valid():
add_args = self.success(form, request)
response_data = {
- 'success': True,
+ 'success': True,
'message': self.success_message,
'redirect': request.GET.get('next')
}
'message': self.success_message,
'redirect': request.GET.get('next')
}
@@
-143,7
+147,7
@@
class AjaxableFormView(object):
if self.placeholdize:
form = placeholdized(form)
context = {
if self.placeholdize:
form = placeholdized(form)
context = {
- self.formname: form,
+ self.formname: form,
"title": title,
"honeypot": self.honeypot,
"placeholdize": self.placeholdize,
"title": title,
"honeypot": self.honeypot,
"placeholdize": self.placeholdize,
@@
-158,12
+162,12
@@
class AjaxableFormView(object):
context_instance=RequestContext(request))
def redirect_or_refresh(self, request, path, message=None):
context_instance=RequestContext(request))
def redirect_or_refresh(self, request, path, message=None):
- """If the form is AJAX, refresh the page. If not, go to `path`."""
+ """If the form is AJAX, refresh the page. If not, go to `path`."""
if request.is_ajax():
output = "<script>window.location.reload()</script>"
if message:
output = "<div class='normal-text'>" + message + "</div>" + output
if request.is_ajax():
output = "<script>window.location.reload()</script>"
if message:
output = "<div class='normal-text'>" + message + "</div>" + output
- return HttpResponse(output)
;
+ return HttpResponse(output)
else:
return HttpResponseRedirect(path)
else:
return HttpResponseRedirect(path)
@@
-185,7
+189,7
@@
class AjaxableFormView(object):
def success(self, form, request):
"""What to do when the form is valid.
def success(self, form, request):
"""What to do when the form is valid.
-
+
By default, just save the form.
"""
By default, just save the form.
"""