diff --git a/kfet/static/kfet/js/history.js b/kfet/static/kfet/js/history.js index 3719042e..33e9a318 100644 --- a/kfet/static/kfet/js/history.js +++ b/kfet/static/kfet/js/history.js @@ -165,6 +165,9 @@ class History { } if (opegroup['add']) { + if (opegroup.type === 'opegroup' && this.api_options.transfersonly) + return; + this.add_node(opegroup); } } diff --git a/kfet/static/kfet/js/kfet.js b/kfet/static/kfet/js/kfet.js index 9c5326c7..332d9349 100644 --- a/kfet/static/kfet/js/kfet.js +++ b/kfet/static/kfet/js/kfet.js @@ -143,6 +143,17 @@ function getErrorsHtml(data) { return content; } +function displayErrors(html) { + $.alert({ + title: 'Erreurs', + content: html, + backgroundDismiss: true, + animation: 'top', + closeAnimation: 'bottom', + keyboardEnabled: true, + }); +} + function requestAuth(data, callback, focus_next = null) { var content = getErrorsHtml(data); content += '
', diff --git a/kfet/templates/kfet/history.html b/kfet/templates/kfet/history.html index c4b458bf..0b6841ae 100644 --- a/kfet/templates/kfet/history.html +++ b/kfet/templates/kfet/history.html @@ -53,8 +53,8 @@

Opérations

- -
+
+
@@ -146,7 +146,7 @@ $(document).ready(function() { var location_url = window.location.pathname.startsWith('/gestion/') ? location_host + '/gestion' : location_host; var socket = new ReconnectingWebSocket(websocket_protocol+"://" + location_url + "/ws/k-fet/k-psul/"); socket.onmessage = function(e) { - data = $.extend({}, websocket_msg_default, JSON.parse(e.data)); + var data = $.extend({}, websocket_msg_default, JSON.parse(e.data)); history.update_data(data); } diff --git a/kfet/templates/kfet/kpsul.html b/kfet/templates/kfet/kpsul.html index 45b50905..7d8309e6 100644 --- a/kfet/templates/kfet/kpsul.html +++ b/kfet/templates/kfet/kpsul.html @@ -208,21 +208,6 @@ $(document).ready(function() { $('#id_comment').val(''); } - // ----- - // Errors ajax - // ----- - - function displayErrors(html) { - $.alert({ - title: 'Erreurs', - content: html, - backgroundDismiss: true, - animation: 'top', - closeAnimation: 'bottom', - keyboardEnabled: true, - }); - } - // ----- // Perform operations // ----- diff --git a/kfet/templates/kfet/transfers.html b/kfet/templates/kfet/transfers.html index a580709f..d61e69fe 100644 --- a/kfet/templates/kfet/transfers.html +++ b/kfet/templates/kfet/transfers.html @@ -10,7 +10,9 @@ + + {% endblock %} @@ -23,6 +25,8 @@
+
+
transferts
@@ -46,146 +50,31 @@