Ticket #4408: form-getValues-fix.diff

form/Form.js

@@ -160 +175 @@
 
                         // get widget values
                         var obj = {};
+                        var usedIds = {};
                         dojo.forEach(this.getDescendants(), function(widget){
                                 var value = widget.getValue ? widget.getValue() : widget.value;
                                 var name = widget.name;
                                 if(!name){ return; }
 
+                                usedIds[widget.domNode.id] = true;
                                 // Store widget's value(s) as a scalar, except for checkboxes which are automatically arrays
                                 if(widget.setChecked){
                                         if(/Radio/.test(widget.declaredClass)){
@@ -189 +206 @@
                                 }
                         });
 
+                        dojo.forEach(this.containerNode.elements, function(elm) {
+                                if (!elm.name || usedIds[elm.id]===true) {
+                                        return;         // like "continue"
+                                }
+                                obj[elm.name] = elm.value;
+                        });
+
                         /***
                          * code for plain input boxes (see also dojo.formToObject, can we use that instead of this code?
                          * but it doesn't understand [] notation, presumably)