get CopyForm to set its own initial values so that we don't have to pass them in

pull/380/head
Matt Westcott 2014-08-01 14:59:39 +01:00
rodzic 5bffa72c1a
commit e1d1fc917f
2 zmienionych plików z 6 dodań i 11 usunięć

Wyświetl plik

@ -82,13 +82,13 @@ class CopyForm(forms.Form):
def __init__(self, *args, **kwargs):
# CopyPage must be passed a 'page' kwarg indicating the page to be copied
self.page = kwargs.pop('page')
super(CopyForm, self).__init__(*args, **kwargs)
return super(CopyForm, self).__init__(*args, **kwargs)
self.fields['new_title'] = forms.CharField(initial=self.page.title)
self.fields['new_slug'] = forms.CharField(initial=self.page.slug)
new_title = forms.CharField()
new_slug = forms.CharField()
copy_subpages = forms.BooleanField(required=False)
publish_copies = forms.BooleanField(required=False)
copy_subpages = forms.BooleanField(required=False, initial=True)
publish_copies = forms.BooleanField(required=False, initial=True)
def clean_new_slug(self):
# Make sure the slug isn't already in use

Wyświetl plik

@ -681,12 +681,7 @@ def copy(request, page_id):
can_publish = parent_page.permissions_for_user(request.user).can_publish_subpage()
# Create the form
form = CopyForm(request.POST or None, page=page, initial={
'new_title': page.title,
'new_slug': page.slug,
'copy_subpages': True,
'publish_copies': True,
})
form = CopyForm(request.POST or None, page=page)
# Check if user is submitting
if request.method == 'POST' and form.is_valid():