Adapt history.html to new functions

kfet/templates/kfet/history.html

@@ -13,8 +13,9 @@
 <script type="text/javascript" src="{% static 'kfet/js/moment-fr.js' %}"></script>
 <script type="text/javascript" src="{% static 'kfet/js/moment-timezone-with-data-2010-2020.js' %}"></script>
 <script type="text/javascript" src="{% static 'kfet/js/bootstrap-datetimepicker.min.js' %}"></script>
+<script type="text/javascript" src="{% url 'js_reverse' %}"></script>
 <script type="text/javascript" src="{% static 'kfet/js/multiple-select.js' %}"></script>
-<script type="text/javascript" src="{% static 'kfet/js/kfet.js' %}"></script>
+<script type="text/javascript" src="{% static 'kfet/js/kfet.api.js' %}"></script>
 <script type="text/javascript" src="{% static 'kfet/js/history.js' %}"></script>
 {% endblock %}
 
@@ -60,6 +61,9 @@
 
 <script type="text/javascript">
 $(document).ready(function() {
+    // Lock to avoid multiple requests
+    window.lock = 0;
+
     settings = { 'subvention_cof': parseFloat({{ settings.subvention_cof|unlocalize }})}
 
     khistory = new KHistory();
@@ -179,79 +183,17 @@ $(document).ready(function() {
         });
     }
 
-    function requestAuth(data, callback) {
+    function cancelOperations(opes_array) {
-        var content = getErrorsHtml(data);
-        content += '<input type="password" name="password" autofocus>',
-        $.confirm({
-            title: 'Authentification requise',
-            content: content,
-            backgroundDismiss: true,
-            animation:'top',
-            closeAnimation:'bottom',
-            keyboardEnabled: true,
-            confirm: function() {
-                var password = this.$content.find('input').val();
-                callback(password);
-            },
-            onOpen: function() {
-                var that = this;
-                this.$content.find('input').on('keypress', function(e) {
-                    if (e.keyCode == 13)
-                        that.$confirmButton.click();
-                });
-            },
-        });
-    }
-
-    function getErrorsHtml(data) {
-        var content = '';
-        if ('missing_perms' in data['errors']) {
-            content += 'Permissions manquantes';
-            content += '<ul>';
-            for (var i=0; i<data['errors']['missing_perms'].length; i++)
-                content += '<li>'+data['errors']['missing_perms'][i]+'</li>';
-            content += '</ul>';
-        }
-        if ('negative' in data['errors']) {
-            var url_base = "{% url 'kfet.account.update' LIQ}";
-            url_base = base_url(0, url_base.length-8);
-            for (var i=0; i<data['errors']['negative'].length; i++) {
-                content += '<a class="btn btn-primary" href="'+url_base+data['errors']['negative'][i]+'/edit" target="_blank">Autorisation de négatif requise pour '+data['errors']['negative'][i]+'</a>';
-            }
-        }
-        return content;
-    }
-
-    function cancelOperations(opes_array, password = '') {
         var data = { 'operations' : opes_array }
-        $.ajax({
+        api_with_auth({
-            dataType: "json",
+            url: Urls['kfet.kpsul.cancel_operations'](),
-            url     : "{% url 'kfet.kpsul.cancel_operations' %}",
+            data: data,
-            method  : "POST",
+            on_success: function(data) {
-            data    : data,
+                khistory.$container.find('.ui-selected').removeClass('ui-selected');
-            beforeSend: function ($xhr) {
+            },
-                $xhr.setRequestHeader("X-CSRFToken", csrftoken);
+            on_400: function(data) {
-                if (password != '')
+                displayErrors(getErrorsHtml(data));
-                    $xhr.setRequestHeader("KFetPassword", password);
             },
-
-        })
-        .done(function(data) {
-            khistory.$container.find('.ui-selected').removeClass('ui-selected');
-        })
-        .fail(function($xhr) {
-            var data = $xhr.responseJSON;
-            switch ($xhr.status) {
-                case 403:
-                    requestAuth(data, function(password) {
-                        cancelOperations(opes_array, password);
-                    });
-                    break;
-                case 400:
-                    displayErrors(getErrorsHtml(data));
-                    break;
-            }
-
         });
     }
 

kfet/templates/kfet/kpsul.html

@@ -270,7 +270,7 @@ $(document).ready(function() {
                 coolReset();
             },
             on_400: function(data) {
-                displayErrors(data);
+                displayErrors(getErrorsHtml(data));
             },
             next_focus: kpsul.account_manager,
         });