Ticket #9983: populatedfields_9983_2.diff

django/contrib/admin/templates/admin/prepopulated_fields_js.html

@@ -2 +2 @@
 {% for field in prepopulated_fields %}
     document.getElementById("{{ field.field.auto_id }}").onchange = function() { this._changed = true; };
     {% for dependency in field.dependencies %}
-    document.getElementById("{{ dependency.auto_id }}").onkeyup = function() {
+        function field_{{ field.field.auto_id }}() {
         var e = document.getElementById("{{ field.field.auto_id }}");
-        if (!e._changed) { e.value = URLify({% for innerdep in field.dependencies %}document.getElementById("{{ innerdep.auto_id }}").value{% if not forloop.last %} + ' ' + {% endif %}{% endfor %}, {{ field.field.field.max_length|default_if_none:"50" }}); }
+        if (!e._changed) { 
+        {% for innerdep in field.dependencies %}
+                        var val_elm = document.getElementById("{{ innerdep.auto_id }}");
+                        if (val_elm.tagName == "SELECT") {
+                                        e.value = URLify(val_elm.options[val_elm.selectedIndex].text{% if not forloop.last %} + ' ' + {% endif %}, {{ field.field.field.max_length|default_if_none:"50" }}); 
+                        }else{
+                        e.value = URLify(val_elm.value{% if not forloop.last %} + ' ' + {% endif %}, {{ field.field.field.max_length|default_if_none:"50" }}); 
+                        }
+                        {% endfor %}
+                        }
     }
+        addEvent(document.getElementById("{{ dependency.auto_id }}"), 'keyup', field_{{ field.field.auto_id }});
+        addEvent(document.getElementById("{{ dependency.auto_id }}"), 'change', field_{{ field.field.auto_id }});
+    
     {% endfor %}
 {% endfor %}
 </script>