X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/2320a8487601e534b6d1456573b0c484cb9817a7..b7cc868621c5c2e7976cd12c4eb0ba81da8ca87c:/apps/cover/forms.py?ds=sidebyside diff --git a/apps/cover/forms.py b/apps/cover/forms.py index 4c718862..e6ffdff4 100755 --- a/apps/cover/forms.py +++ b/apps/cover/forms.py @@ -6,8 +6,9 @@ import re from urllib2 import urlopen from django import forms -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext_lazy as _, ugettext from cover.models import Image +from django.utils.text import mark_safe class ImageAddForm(forms.ModelForm): class Meta: @@ -15,13 +16,20 @@ class ImageAddForm(forms.ModelForm): 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 + self.fields['file'].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 + cl = self.cleaned_data['download_url'] or None + if cl is not None: + try: + img = Image.objects.get(download_url=cl) + except Image.DoesNotExist: + pass + else: + raise forms.ValidationError(mark_safe( + ugettext('Image already in repository.' + ) % {'url': img.get_absolute_url()})) + return cl def clean(self): cleaned_data = super(ImageAddForm, self).clean() @@ -29,7 +37,6 @@ class ImageAddForm(forms.ModelForm): raise forms.ValidationError('No image specified') return cleaned_data - class ImageEditForm(forms.ModelForm): """Form used for editing a Book.""" class Meta: @@ -38,7 +45,7 @@ class ImageEditForm(forms.ModelForm): class ReadonlyImageEditForm(ImageEditForm): - """Form used for not editing a Book.""" + """Form used for not editing an Image.""" def __init__(self, *args, **kwargs): ret = super(ReadonlyImageEditForm, self).__init__(*args, **kwargs) @@ -73,7 +80,7 @@ class FlickrForm(forms.Form): assert match license_url = match.group(1) self.cleaned_data['license_url'] = license_url - re_license = re.compile(r'http://creativecommons.org/licenses/([^/]*)/([^/]*)/.*') + re_license = re.compile(r'https?://creativecommons.org/licenses/([^/]*)/([^/]*)/.*') m = re_license.match(license_url) assert m self.cleaned_data['license_name'] = 'CC %s %s' % (m.group(1).upper(), m.group(2))