Briq/django-admin-sortable-fixwin
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bumped version to 1.5.4.

Browse Source 
Replaced jQuery loaded from CDN with jQuery included with Django Admin.
Replaced jQuery UI from CDN with django.jQuery namespaced jQueryUI 1.8.11.
Implemented static includes using {% static %} template tag.
Removed documentation concerning override of sortable inlines whose parent doesn't inherit from sortable until a consistent workaround can be achieved.
Added CSRF protection for sort views.
This commit is contained in:
Brandon Taylor
2013-09-05 14:09:50 -04:00
parent b8bb4e4d6b
commit 1bf917da61
11 changed files with 132 additions and 898 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adminsortable/templates/adminsortable/change_form.html
+4 -5
View File
@@ -8,18 +8,17 @@
{% url 'admin:jsi18n' as jsi18nurl %}
{% if has_sortable_tabular_inlines or has_sortable_stacked_inlines %}
{% include sortable_javascript_includes_template with inlines=True %}
<script type="text/javascript" src="{% static 'adminsortable/js/jquery-ui.django-admin.min.js' %}"></script>
<script type="text/javascript" src="{% static 'adminsortable/js/jquery.django-csrf.js' %}"></script>
{% endif %}
<script type="text/javascript" src="{% static 'adminsortable/js/jquery.django-csrf.js' %}"></script>
{% if has_sortable_tabular_inlines %}
<script type="text/javascript" src="{% static 'adminsortable/js/admin.sortable.tabular.inlines.js' %}"></script>
{% endif %}
{% if has_sortable_stacked_inlines %}
<script type="text/javascript" src="{% static 'adminsortable/js/admin.sortable.stacked.inlines.js' %}"></script>
{% endif %}
{% if has_sortable_stacked_inlines %}
<script type="text/javascript" src="{% static 'adminsortable/js/jquery.effects.core.js' %}"></script>
{% endif %}
{% endblock %}
{% block extrastyle %}
adminsortable/templates/adminsortable/change_list.html
+3 -1
View File
@@ -9,7 +9,9 @@
{% block extrahead %}
{{ block.super }}
{% include sortable_javascript_includes_template %}
<script type="text/javascript" src="{% static 'admin/js/jquery.js' %}"></script>
<script type="text/javascript" src="{% static 'admin/js/jquery.init.js' %}"></script>
<script type="text/javascript" src="{% static 'adminsortable/js/jquery-ui.django-admin.min.js' %}"></script>
<script type="text/javascript" src="{% static 'adminsortable/js/jquery.django-csrf.js' %}"></script>
<script type="text/javascript" src="{% static 'adminsortable/js/admin.sortable.js' %}"></script>
{% endblock %}
adminsortable/templates/adminsortable/shared/javascript_includes.html
-2
View File
@@ -1,2 +0,0 @@
<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.2/jquery-ui.min.js"></script>