Ticket #19082: better_prepopulated_fields_logic_with_tests.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']:

tests/regressiontests/admin_views/tests.py

@@ -3270 +3270 @@
             slug2='option-one-tabular-inline-ignored-characters',
         )
 
+    def test_populate_existing_entry(self):
+        item = MainPrepopulated.objects.create(
+            name=' this is the mAin nÀMë',
+            pubdate='2012-02-18',
+            status='option two',
+            slug1='main-name-2012-02-18',
+            slug2='option-two-main-name'
+        )
+        self.admin_login(username='super',
+                         password='secret',
+                         login_url='/test_admin/admin/')
+
+        self.selenium.get('%s%s' % (self.live_server_url,
+                                    '/test_admin/admin/admin_views/'
+                                    'mainprepopulated/{}/'.format(item.id)))
+
+        self.selenium.find_element_by_css_selector('#id_name').send_keys(' the best')
+
+        slug1 = self.selenium.find_element_by_css_selector('#id_slug1').get_attribute('value')
+        slug2 = self.selenium.find_element_by_css_selector('#id_slug2').get_attribute('value')
+
+        self.assertEqual(slug1, 'main-name-best-2012-02-18')
+        self.assertEqual(slug2, 'option-two-main-name-best')
+
+
 
 class SeleniumPrePopulatedChromeTests(SeleniumPrePopulatedFirefoxTests):
     webdriver_class = 'selenium.webdriver.chrome.webdriver.WebDriver'