librarian update

[redakcja.git] / apps / cover / forms.py

diff --git a/apps/cover/forms.py b/apps/cover/forms.py
index 67a0c53..969d13a 100755 (executable)
--- a/apps/cover/forms.py
+++ b/apps/cover/forms.py
@@ -9,17 +9,21 @@ from django import forms
 from django.utils.translation import ugettext_lazy as _
 from cover.models import Image
 
 from django.utils.translation import ugettext_lazy as _
 from cover.models import Image
 

+

 class ImageAddForm(forms.ModelForm):
     class Meta:
         model = Image
 
     def __init__(self, *args, **kwargs):
         super(ImageAddForm, self).__init__(*args, **kwargs)
 class ImageAddForm(forms.ModelForm):
     class Meta:
         model = Image
 
     def __init__(self, *args, **kwargs):
         super(ImageAddForm, self).__init__(*args, **kwargs)

-        self.fields['file'].required = self.fields['download_url'].required = False
+        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_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):
     def clean(self):
         cleaned_data = super(ImageAddForm, self).clean()
         if not cleaned_data.get('download_url', None) and not cleaned_data.get('file', None):


@@ -38,13 +42,12 @@ class ReadonlyImageEditForm(ImageEditForm):
     """Form used for not editing a Book."""
 
     def __init__(self, *args, **kwargs):
     """Form used for not editing a Book."""
 
     def __init__(self, *args, **kwargs):

-        ret = super(ReadonlyImageEditForm, self).__init__(*args, **kwargs)
+        super(ReadonlyImageEditForm, self).__init__(*args, **kwargs)

         for field in self.fields.values():
             field.widget.attrs.update({"readonly": True})
         for field in self.fields.values():
             field.widget.attrs.update({"readonly": True})

-        return ret

 
     def save(self, *args, **kwargs):
 
     def save(self, *args, **kwargs):

-        raise AssertionError, "ReadonlyImageEditForm should not be saved."
+        raise AssertionError("ReadonlyImageEditForm should not be saved.")

 
 
 class FlickrForm(forms.Form):
 
 
 class FlickrForm(forms.Form):


@@ -53,7 +56,7 @@ class FlickrForm(forms.Form):
     def clean_source_url(self):
         def normalize_html(html):
             return re.sub('[\t\n]', '', html)
     def clean_source_url(self):
         def normalize_html(html):
             return re.sub('[\t\n]', '', html)

-    
+

         url = self.cleaned_data['source_url']
         m = re.match(r'(https?://)?(www\.|secure\.)?flickr\.com/photos/(?P<author>[^/]+)/(?P<img>\d+)/?', url)
         if not m:
         url = self.cleaned_data['source_url']
         m = re.match(r'(https?://)?(www\.|secure\.)?flickr\.com/photos/(?P<author>[^/]+)/(?P<img>\d+)/?', url)
         if not m: