Skip to content

Remove browser overriding #3410

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

Closed
lovelydinosaur wants to merge 8 commits into from
Closed

Remove browser overriding #3410

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
60c1725
Add test to check if a 415 status is returned for unsupported media t…
Aug 3, 2015
8cae462
Merge pull request #3401 from nryoung/update-transifex-client-reqs
xordoquy Sep 15, 2015
566812a
Remove method and content overriding
lovelydinosaur Sep 17, 2015
4b4130e
Fix request cloning, so method becomes set
lovelydinosaur Sep 17, 2015
66e3722
Merge branch 'method-not-allowed-not-raised' of https://github.com/ca…
lovelydinosaur Sep 17, 2015
343fd5e
Merge branch 'canassa-method-not-allowed-not-raised' into remove-cont…
lovelydinosaur Sep 17, 2015
b8ebe29
Import sorting
lovelydinosaur Sep 17, 2015
eec1156
AJAX forms in admin interface
lovelydinosaur Sep 17, 2015
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
Prev Previous commit
AJAX forms in admin interface
  • Loading branch information
@lovelydinosaur
lovelydinosaur committed Sep 17, 2015
commit eec1156f630ef45456bafb092d136670f8017463
2 changes: 0 additions & 2 deletions rest_framework/static/rest_framework/js/jquery-1.8.1-min.js
View file
Open in desktop

This file was deleted.

21 changes: 13 additions & 8 deletions rest_framework/templates/rest_framework/admin.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,7 @@
{% endif %}

{% if delete_form %}
<form class="button-form" action="{{ request.get_full_path }}" method="POST">
{% csrf_token %}
<input type="hidden" name="{{ api_settings.FORM_METHOD_OVERRIDE }}" value="DELETE" />
<form class="button-form" action="{{ request.get_full_path }}" data-method="DELETE">
<button class="btn btn-danger">
<span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Delete
</button>
Expand Down Expand Up @@ -180,15 +178,15 @@ <h4 class="modal-title" id="myModalLabel">Create</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="myModalLabel">Edit</h4>
</div>
<form action="{{ request.get_full_path }}" method="POST" enctype="multipart/form-data" class="form-horizontal" novalidate>
<form action="{{ request.get_full_path }}" data-method="PUT" enctype="multipart/form-data" class="form-horizontal" novalidate>
<div class="modal-body">
<fieldset>
{{ put_form }}
</fieldset>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<button name="{{ api_settings.FORM_METHOD_OVERRIDE }}" value="PUT" type="submit" class="btn btn-primary">Save</button>
<button type="submit" class="btn btn-primary">Save</button>
</div>
</form>
</div>
Expand All @@ -204,15 +202,15 @@ <h4 class="modal-title" id="myModalLabel">Edit</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="myModalLabel">{{ error_title }}</h4>
</div>
<form action="{{ request.get_full_path }}" method="POST" enctype="multipart/form-data" class="form-horizontal" novalidate>
<form action="{{ request.get_full_path }}" data-method="{{ request.method }}" enctype="multipart/form-data" class="form-horizontal" novalidate>
<div class="modal-body">
<fieldset>
{{ error_form }}
</fieldset>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
<button name="{{ api_settings.FORM_METHOD_OVERRIDE }}" value="{{ request.method }}" type="submit" class="btn btn-primary">Save</button>
<button type="submit" class="btn btn-primary">Save</button>
</div>
</form>
</div>
Expand All @@ -221,10 +219,17 @@ <h4 class="modal-title" id="myModalLabel">{{ error_title }}</h4>
{% endif %}

{% block script %}
<script src="{% static "rest_framework/js/jquery-1.8.1-min.js" %}"></script>
<script src="{% static "rest_framework/js/jquery-1.11.3-min.js" %}"></script>
<script src="{% static "rest_framework/js/ajax-form.js" %}"></script>
<script src="{% static "rest_framework/js/csrf.js" %}"></script>
<script src="{% static "rest_framework/js/bootstrap.min.js" %}"></script>
<script src="{% static "rest_framework/js/prettify-min.js" %}"></script>
<script src="{% static "rest_framework/js/default.js" %}"></script>
<script>
$(document).ready(function() {
$('form').ajaxForm();
});
</script>
{% endblock %}
</body>
{% endblock %}
Expand Down