diff --git a/AKScheduling/templates/admin/AKScheduling/manage_tracks.html b/AKScheduling/templates/admin/AKScheduling/manage_tracks.html index 754f0e909802d05727a941ff3b3f5048a7d30ddc..f1a19e8c314e4572436ecfa8578935c3c48bbb83 100644 --- a/AKScheduling/templates/admin/AKScheduling/manage_tracks.html +++ b/AKScheduling/templates/admin/AKScheduling/manage_tracks.html @@ -13,7 +13,7 @@ {% block extrahead %} {{ block.super }} - <script src="{% static "common/vendor/sortable/sortable.min.js" %}"></script> + <script src="{% static "common/vendor/sortable/Sortable.min.js" %}"></script> <script src="{% static "common/vendor/sortable/jquery-sortable.js" %}"></script> <style> @@ -77,7 +77,9 @@ } function update_ak_track(ak_id, track_id, container) { - mark_dirty(container); + if(container!==undefined) + mark_dirty(container); + $.ajax({ url: "{% url "model:AK-list" event_slug=event.slug %}" + ak_id + "/", type: 'PATCH', @@ -85,7 +87,8 @@ track: track_id, }, success: function (response) { - mark_clean(container); + if(container!==undefined) + mark_clean(container); }, error: function (response) { alert("ERROR. Did not update " + changeInfo.event.title) @@ -100,16 +103,16 @@ // Element is dropped into the list from another list onAdd: function (/**Event*/evt) { // same properties as onEnd - console.log(evt.item); var ak_id = evt.item.dataset["akId"]; - var container = $(evt.to).parents(".track-container"); - if(evt.to.dataset["sync"]==="true") - { - var track_id = evt.to.dataset["trackId"] + + // For lists that should stay in sync with server (all except 'without track') + if(evt.to.dataset["sync"]==="true") { + var container = $(evt.to).parents(".track-container"); + var track_id = evt.to.dataset["trackId"]; update_ak_track(ak_id, track_id, container); } else { - update_ak_track(ak_id, ""); + update_ak_track(ak_id, "", undefined); } }, }; diff --git a/templates/admin/base_site.html b/templates/admin/base_site.html index bcb2a34f50c03b077e7bed3d3a007c34a5f20085..2a994ce238cec0776f486950e976741b27e78100 100644 --- a/templates/admin/base_site.html +++ b/templates/admin/base_site.html @@ -11,6 +11,10 @@ {% endblock %} {% block extrahead %} + <!-- Load popper before bootstrap loads --> + <script src="{% static "common/vendor/popper/popper-1.14.7.min.js" %}"></script> + + <!-- Load bootstrap, jquery and fontawesome--> {% bootstrap_css %} {% bootstrap_javascript jquery='full' %} {% fontawesome_5_static %} diff --git a/templates/base.html b/templates/base.html index 7971ddbfe96b0964f12486e229421614bc242f4c..d71471ed78dbcd2dd822ab993555b2720e0f60d5 100644 --- a/templates/base.html +++ b/templates/base.html @@ -12,7 +12,10 @@ <title>{% block title %}AK Planning{% endblock %}</title> - {# Load Bootstrap CSS and JavaScript as well as font awesome #} + <!-- Load popper before bootstrap loads --> + <script src="{% static "common/vendor/popper/popper-1.14.7.min.js" %}"></script> + + <!-- Load bootstrap, jquery and fontawesome--> {% bootstrap_css %} {% bootstrap_javascript jquery='slim' %} {% fontawesome_5_static %}