EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix two form bugs 

1. fix doi regexp
2. supress validation error when file is uploaded, not url
pull/1/head
eric 2016-10-05 18:02:03 -04:00
parent 8c502513ea
commit 41d8f53268
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/forms.py
View File

@ -201,7 +201,7 @@ class EditionForm(forms.ModelForm):
) )
doi = forms.RegexField( doi = forms.RegexField(
label=_("DOI"), label=_("DOI"),
regex=r'^(https?://dx\.doi\.org/)?(10.\d\d\d\d/\w+|delete)$', regex=r'^(https?://dx\.doi\.org/)?(10.\d\d\d\d/\S+|delete)$',
required = False, required = False,
help_text = _("starts with '10.' or 'http://dx.doi.org'"), help_text = _("starts with '10.' or 'http://dx.doi.org'"),
error_messages = { error_messages = {
@ -335,10 +335,11 @@ class EbookForm(forms.ModelForm):
return new_label if new_label else self.cleaned_data['version_label'] return new_label if new_label else self.cleaned_data['version_label']
def clean_provider(self): def clean_provider(self):
new_provider = Ebook.infer_provider(self.cleaned_data['url']) url = self.cleaned_data['url']
if not new_provider: new_provider = Ebook.infer_provider(url)
if url and not new_provider:
raise forms.ValidationError(_("At this time, ebook URLs must point at Internet Archive, Wikisources, Wikibooks, Hathitrust, Project Gutenberg, raw files at Github, or Google Books.")) raise forms.ValidationError(_("At this time, ebook URLs must point at Internet Archive, Wikisources, Wikibooks, Hathitrust, Project Gutenberg, raw files at Github, or Google Books."))
return new_provider return new_provider if new_provider else "Unglue.it"
def clean_url(self): def clean_url(self):
url = self.cleaned_data['url'] url = self.cleaned_data['url']