Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 4 commits into from
Dec 18, 2017
Merged

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

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dad3f5f
Fix issue where you couldn't edit your canonical domain.
ericholscher Dec 8, 2017
1c1798c
Add test for canonical domain
ericholscher Dec 18, 2017
ca900d0
Merge remote-tracking branch 'origin/master' into fix-domain-editing
ericholscher Dec 18, 2017
c6cf8f0
Clean up test
ericholscher Dec 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions readthedocs/projects/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down