Merge pull request readthedocs#3387 from rtfd/fix-domain-editing

Fix issue where you couldn't edit your canonical domain.

Author: ericholscher

readthedocs/projects/forms.py

@@ -570,9 +570,10 @@ def clean_domain(self):
 
     def clean_canonical(self):
         canonical = self.cleaned_data['canonical']
+        _id = self.initial.get('id')
         if canonical and Domain.objects.filter(
-                project=self.project, canonical=True).exclude(
-                    domain=self.cleaned_data['domain']).exists():
+                project=self.project, canonical=True
+        ).exclude(pk=_id).exists():
             raise forms.ValidationError(
                 _('Only 1 Domain can be canonical at a time.'))
         return canonical

readthedocs/rtd_tests/tests/test_domains.py

@@ -81,6 +81,26 @@ def test_https(self):
                           project=self.project)
         self.assertFalse(form.is_valid())
 
+    def test_canonical_change(self):
+        """Make sure canonical can be properly changed"""
+        form = DomainForm({'domain': 'example.com', 'canonical': True},
+                          project=self.project)
+        self.assertTrue(form.is_valid())
+        domain = form.save()
+        self.assertEqual(domain.domain, 'example.com')
+
+        form = DomainForm({'domain': 'example2.com', 'canonical': True},
+                          project=self.project)
+        self.assertFalse(form.is_valid())
+        self.assertEqual(form.errors['canonical'][0], 'Only 1 Domain can be canonical at a time.')
+
+        form = DomainForm({'domain': 'example2.com', 'canonical': True},
+                          project=self.project,
+                          instance=domain)
+        self.assertTrue(form.is_valid())
+        domain = form.save()
+        self.assertEqual(domain.domain, 'example2.com')
+
 
 class TestAPI(TestCase):