Better callback management

kfet/static/kfet/js/kfet.js

@@ -177,12 +177,12 @@ function isValidTrigramme(trigramme) {
 
 class UserDialog {
 
-    static get default_data() {
+    static get defaults() {
-        return {'title': '', 'content': '', 'callback_as_dict': false};
+        return {'title': '', 'content': ''};
     }
     
     constructor(data) {
-        $.extend(this, this.constructor.default_data, data);
+        $.extend(this, this.constructor.defaults, data);
     }
 
     open(callback, errors, next_focus) {
@@ -195,18 +195,14 @@ class UserDialog {
             closeAnimation:'bottom',
             keyboardEnabled: true,
             confirm: function() {
-                if (that.callback_as_dict) {
+                var inputs = {};
-                    var inputs = {};
+                this.$content.find('input').each(function () {
-                    this.$content.find('input').each(function () {
+                    inputs[$(this).attr('name')] = $(this).val();
-                        inputs[$(this).attr('name')] = $(this).val();
+                });
-                    });
+                if (Object.keys(inputs).length > 1)
                     return callback(inputs);
-                } else {
+                else
-                    var input_values = this.$content.find('input').map(function () { 
+                    return callback(inputs[Object.keys(inputs)[0]]);
-                        return $(this).val();
-                    }).get();
-                    return callback.apply(null, input_values);
-                }
             },
             onOpen: function() {
                 var that = this

kfet/templates/kfet/kpsul.html

@@ -243,7 +243,7 @@ $(document).ready(function() {
                 if ('need_comment' in data['errors'])
                     askComment(performOperations);
                 else
-                    displayErrors(data);
+                    displayErrors(getErrorsHtml(data));
             },
             next_focus: articleSelect,
         });