X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/2d649c8fe8dd70c00c70b83d2f139f6a3fe1d0aa..aa48ae37a4a0c49642ca4f21c809099c05c79865:/apps/cover/forms.py

diff --git a/apps/cover/forms.py b/apps/cover/forms.py
index 7fc6a33e..628cb63e 100755
--- a/apps/cover/forms.py
+++ b/apps/cover/forms.py
@@ -12,6 +12,24 @@ from cover.models import Image
 class ImageAddForm(forms.ModelForm):
     class Meta:
         model = Image
+        exclude = []
+
+    def __init__(self, *args, **kwargs):
+        super(ImageAddForm, self).__init__(*args, **kwargs)
+        self.fields['file'].required = self.fields['download_url'].required = self.fields['source_url'].required = False
+
+    def clean_download_url(self):
+        return self.cleaned_data['download_url'] or None
+
+    def clean_source_url(self):
+        return self.cleaned_data['source_url'] or None
+
+    def clean(self):
+        cleaned_data = super(ImageAddForm, self).clean()
+        if not cleaned_data.get('download_url', None) and not cleaned_data.get('file', None):
+            raise forms.ValidationError('No image specified')
+        return cleaned_data
+
 
 class ImageEditForm(forms.ModelForm):
     """Form used for editing a Book."""
@@ -63,7 +81,7 @@ class FlickrForm(forms.Form):
         except AssertionError:
             raise forms.ValidationError('Error reading license name.')
 
-        m = re.search(r'<strong class="username">By <a href="[^"]*">([^<]*)</a></strong>', html)
+        m = re.search(r'"ownername":"([^"]*)', html)
         if m:
             self.cleaned_data['author'] = "%s@Flickr" % m.group(1)
         else: