summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-05-16 22:10:55 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-06-12 08:44:34 +0200
commitb60b139c047fa0d1ae683a3e66181f5135f007e2 (patch)
tree96251cf29c771677f49c632627c4be81fc2d0e94 /ishtar_common
parent882cf2378f7b1af9d8f08a287c2f9fc96dd3742e (diff)
downloadIshtar-b60b139c047fa0d1ae683a3e66181f5135f007e2.tar.bz2
Ishtar-b60b139c047fa0d1ae683a3e66181f5135f007e2.zip
Importer form: fix url check
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/forms_common.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py
index 0a654ef8b..23b29aef4 100644
--- a/ishtar_common/forms_common.py
+++ b/ishtar_common/forms_common.py
@@ -160,9 +160,12 @@ class NewImportForm(forms.ModelForm):
def clean_imported_images_link(self):
value = self.cleaned_data.get('imported_images_link', None)
- if not is_downloadable(value):
- raise forms.ValidationError(
- _(u"No file is available for this link."))
+ if value:
+ try:
+ assert is_downloadable(value)
+ except (AssertionError, requests.exceptions.RequestException):
+ raise forms.ValidationError(
+ _(u"Invalid link or no file is available for this link."))
return value
def save(self, user, commit=True):