Skip to content
Snippets Groups Projects
Commit 2c359090 authored by Benjamin Hättasch's avatar Benjamin Hättasch
Browse files

Fix several javascript issues

Make sure popper frontend dependency is always loaded before bootstrap script files load
This fixes #121 as well as issues in admin interface (scheduling and track management)
Make track management javascript more robust (this resolves an issue occurring when moving an AK with track back to list of AKs without tracks)
parent aa001e3e
No related branches found
No related tags found
No related merge requests found
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
{% block extrahead %} {% block extrahead %}
{{ block.super }} {{ 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> <script src="{% static "common/vendor/sortable/jquery-sortable.js" %}"></script>
<style> <style>
...@@ -77,7 +77,9 @@ ...@@ -77,7 +77,9 @@
} }
function update_ak_track(ak_id, track_id, container) { function update_ak_track(ak_id, track_id, container) {
mark_dirty(container); if(container!==undefined)
mark_dirty(container);
$.ajax({ $.ajax({
url: "{% url "model:AK-list" event_slug=event.slug %}" + ak_id + "/", url: "{% url "model:AK-list" event_slug=event.slug %}" + ak_id + "/",
type: 'PATCH', type: 'PATCH',
...@@ -85,7 +87,8 @@ ...@@ -85,7 +87,8 @@
track: track_id, track: track_id,
}, },
success: function (response) { success: function (response) {
mark_clean(container); if(container!==undefined)
mark_clean(container);
}, },
error: function (response) { error: function (response) {
alert("ERROR. Did not update " + changeInfo.event.title) alert("ERROR. Did not update " + changeInfo.event.title)
...@@ -100,16 +103,16 @@ ...@@ -100,16 +103,16 @@
// Element is dropped into the list from another list // Element is dropped into the list from another list
onAdd: function (/**Event*/evt) { onAdd: function (/**Event*/evt) {
// same properties as onEnd // same properties as onEnd
console.log(evt.item);
var ak_id = evt.item.dataset["akId"]; var ak_id = evt.item.dataset["akId"];
var container = $(evt.to).parents(".track-container");
if(evt.to.dataset["sync"]==="true") // For lists that should stay in sync with server (all except 'without track')
{ if(evt.to.dataset["sync"]==="true") {
var track_id = evt.to.dataset["trackId"] var container = $(evt.to).parents(".track-container");
var track_id = evt.to.dataset["trackId"];
update_ak_track(ak_id, track_id, container); update_ak_track(ak_id, track_id, container);
} }
else { else {
update_ak_track(ak_id, ""); update_ak_track(ak_id, "", undefined);
} }
}, },
}; };
......
...@@ -11,6 +11,10 @@ ...@@ -11,6 +11,10 @@
{% endblock %} {% endblock %}
{% block extrahead %} {% 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_css %}
{% bootstrap_javascript jquery='full' %} {% bootstrap_javascript jquery='full' %}
{% fontawesome_5_static %} {% fontawesome_5_static %}
......
...@@ -12,7 +12,10 @@ ...@@ -12,7 +12,10 @@
<title>{% block title %}AK Planning{% endblock %}</title> <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_css %}
{% bootstrap_javascript jquery='slim' %} {% bootstrap_javascript jquery='slim' %}
{% fontawesome_5_static %} {% fontawesome_5_static %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment