Skip to content

Commit a1a5acc

Browse files
authored
Merge pull request #287 from lprokein/csrf-cookie-name
Changing default CSRF cookie name setting
2 parents 8c93d35 + 6f7dc54 commit a1a5acc

File tree

6 files changed

+17
-8
lines changed

6 files changed

+17
-8
lines changed

martor/settings.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,3 +233,9 @@
233233
)
234234
# Disable admin style when using custom admin interface e.g django-grappelli
235235
MARTOR_ENABLE_ADMIN_CSS = getattr(settings, "MARTOR_ENABLE_ADMIN_CSS", True)
236+
237+
MARTOR_CSRF_COOKIE_NAME = (
238+
settings.MARTOR_CSRF_COOKIE_NAME
239+
if hasattr(settings, "MARTOR_CSRF_COOKIE_NAME")
240+
else "csrftoken"
241+
)

martor/static/martor/js/martor.bootstrap.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
url: textareaId.data('search-users-url'),
9393
data: {
9494
'username': username,
95-
'csrfmiddlewaretoken': getCookie('csrftoken')
95+
'csrfmiddlewaretoken': getCookie(textareaId.data('csrf-cookie-name'))
9696
},
9797
success: function (data) {
9898
if (data['status'] == 200) {
@@ -154,7 +154,7 @@
154154
var value = textareaId.val();
155155
var form = new FormData();
156156
form.append('content', value);
157-
form.append('csrfmiddlewaretoken', getCookie('csrftoken'));
157+
form.append('csrfmiddlewaretoken', getCookie(textareaId.data('csrf-cookie-name')));
158158
currentTab.addClass('martor-preview-stale');
159159

160160
$.ajax({
@@ -541,7 +541,7 @@
541541
var firstForm = $('#' + editorId).closest('form').get(0);
542542
var field_name = editor.container.id.replace('martor-', '');
543543
var form = new FormData(firstForm);
544-
form.append('csrfmiddlewaretoken', getCookie('csrftoken'));
544+
form.append('csrfmiddlewaretoken', getCookie(textareaId.data('csrf-cookie-name')));
545545

546546
$.ajax({
547547
url: textareaId.data('upload-url'),

martor/static/martor/js/martor.bootstrap.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

martor/static/martor/js/martor.semantic.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
url: textareaId.data('search-users-url'),
9393
data: {
9494
'username': username,
95-
'csrfmiddlewaretoken': getCookie('csrftoken')
95+
'csrfmiddlewaretoken': getCookie(textareaId.data('csrf-cookie-name'))
9696
},
9797
success: function (data) {
9898
if (data['status'] == 200) {
@@ -143,7 +143,7 @@
143143
var value = textareaId.val();
144144
var form = new FormData();
145145
form.append('content', value);
146-
form.append('csrfmiddlewaretoken', getCookie('csrftoken'));
146+
form.append('csrfmiddlewaretoken', getCookie(textareaId.data('csrf-cookie-name')));
147147
currentTab.addClass('martor-preview-stale');
148148

149149
$.ajax({
@@ -536,7 +536,7 @@
536536
var firstForm = $('#' + editorId).closest('form').get(0);
537537
var field_name = editor.container.id.replace('martor-', '');
538538
var form = new FormData(firstForm);
539-
form.append('csrfmiddlewaretoken', getCookie('csrftoken'));
539+
form.append('csrfmiddlewaretoken', getCookie(textareaId.data('csrf-cookie-name')));
540540

541541
$.ajax({
542542
url: textareaId.data('upload-url'),

martor/static/martor/js/martor.semantic.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

martor/widgets.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
MARTOR_THEME,
1919
MARTOR_TOOLBAR_BUTTONS,
2020
MARTOR_UPLOAD_URL,
21+
MARTOR_CSRF_COOKIE_NAME,
2122
)
2223

2324

@@ -40,6 +41,7 @@ def render(self, name, value, attrs=None, renderer=None, **kwargs):
4041
attributes_to_pass = {
4142
"data-enable-configs": MARTOR_ENABLE_CONFIGS,
4243
"data-markdownfy-url": reverse("martor_markdownfy"),
44+
"data-csrf-cookie-name": MARTOR_CSRF_COOKIE_NAME,
4345
}
4446

4547
if MARTOR_UPLOAD_URL:
@@ -51,6 +53,7 @@ def render(self, name, value, attrs=None, renderer=None, **kwargs):
5153
if MARTOR_MARKDOWNIFY_TIMEOUT:
5254
attributes_to_pass["data-save-timeout"] = MARTOR_MARKDOWNIFY_TIMEOUT
5355

56+
5457
# Make sure that the martor value is in the class attr passed in
5558
if "class" in attrs:
5659
attrs["class"] += " martor"

0 commit comments

Comments
 (0)