Ticket #2972: auto_populated_field_script.patch

django/contrib/admin/templatetags/admin_modify.py

@@ -180 +180 @@
 output_all = register.simple_tag(output_all)
 
 def auto_populated_field_script(auto_pop_fields, change = False):
+    dependencies = []
+    dependencies_bodies = {}
+    dependencies_scripts = {}
+    for field in auto_pop_fields:
+        for g in field.prepopulate_from:
+            if g not in dependencies:
+                dependencies.append(g)
+                dependencies_bodies[g] = []
+                dependencies_scripts[g] = ""
+
     t = []
     for field in auto_pop_fields:
+        for g in field.prepopulate_from:
+            if g not in dependencies:
+                dependencies.append(g)
         if change:
             t.append(u'document.getElementById("id_%s")._changed = true;' % field.name)
         else:
@@ -189 +202 @@
 
         add_values = u' + " " + '.join([u'document.getElementById("id_%s").value' % g for g in field.prepopulate_from])
         for f in field.prepopulate_from:
-            t.append(u'document.getElementById("id_%s").onkeyup = function() {' \
-                     ' var e = document.getElementById("id_%s");' \
-                     ' if(!e._changed) { e.value = URLify(%s, %s);} }; ' % (
-                     f, field.name, add_values, field.max_length))
+            var_name = 'e_%s' % field.name
+            f_script_body = u' var %s = document.getElementById("id_%s");' \
+                            ' if(!%s._changed) { %s.value = URLify(%s, %s);}\n ' % (
+                var_name, field.name, var_name, var_name, add_values, field.max_length)
+            dependencies_bodies[f].append(f_script_body)
+
+    t = []
+    for field in auto_pop_fields:
+        for f in field.prepopulate_from:
+            if dependencies_scripts[f] == "":
+                f_script_pre  = u'document.getElementById("id_%s").onkeyup = function() {' % f
+                f_script_post = '\n }; '
+                f_script = f_script_pre + u''.join(dependencies_bodies[f]) + f_script_post
+                t.append(f_script)
+                dependencies_scripts[f] = f_script
+
     return u''.join(t)
 auto_populated_field_script = register.simple_tag(auto_populated_field_script)