Ticket #19082: better_prepopulated_fields_logic.diff

django/contrib/admin/static/admin/js/prepopulate.js

@@ -14 +14 @@
             field.change(function() {
                 field.data('_changed', true);
             });
+            if (field.val()) {
+                field.data('_filled', true);
+            } else {
+                field.data('_filled', false);
+            }
 
             var populate = function () {
                 // Bail if the fields value has changed
-                if (field.data('_changed') == true) return;
+                if (field.data('_changed') == true || field.data('_filled') == true) return;
  
                 var values = [];
                 $.each(dependencies, function(i, field) {

django/contrib/admin/templatetags/admin_modify.py

@@ -9 +9 @@
     the prepopulated fields for both the admin form and inlines.
     """
     prepopulated_fields = []
-    if context['add'] and 'adminform' in context:
+    if 'adminform' in context:
         prepopulated_fields.extend(context['adminform'].prepopulated_fields)
     if 'inline_admin_formsets' in context:
         for inline_admin_formset in context['inline_admin_formsets']: