fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Metadata editor
[redakcja.git]
/
src
/
cover
/
forms.py
diff --git
a/src/cover/forms.py
b/src/cover/forms.py
index
c4f06fa
..
ee82a5a
100644
(file)
--- a/
src/cover/forms.py
+++ b/
src/cover/forms.py
@@
-21,6
+21,11
@@
class ImageAddForm(forms.ModelForm):
def __init__(self, *args, **kwargs):
super(ImageAddForm, self).__init__(*args, **kwargs)
self.fields['file'].required = False
def __init__(self, *args, **kwargs):
super(ImageAddForm, self).__init__(*args, **kwargs)
self.fields['file'].required = False
+ self.fields['use_file'].required = False
+ self.fields['cut_top'].required = False
+ self.fields['cut_left'].required = False
+ self.fields['cut_bottom'].required = False
+ self.fields['cut_right'].required = False
def clean_download_url(self):
cl = self.cleaned_data['download_url'] or None
def clean_download_url(self):
cl = self.cleaned_data['download_url'] or None
@@
-45,6
+50,11
@@
class ImageAddForm(forms.ModelForm):
% {'url': same_source.first().get_absolute_url()}))
return source_url
% {'url': same_source.first().get_absolute_url()}))
return source_url
+ clean_cut_top = lambda self: self.cleaned_data.get('cut_top') or 0
+ clean_cut_bottom = lambda self: self.cleaned_data.get('cut_bottom') or 0
+ clean_cut_left = lambda self: self.cleaned_data.get('cut_left') or 0
+ clean_cut_right = lambda self: self.cleaned_data.get('cut_right') or 0
+
def clean(self):
cleaned_data = super(ImageAddForm, self).clean()
download_url = cleaned_data.get('download_url', None)
def clean(self):
cleaned_data = super(ImageAddForm, self).clean()
download_url = cleaned_data.get('download_url', None)
@@
-92,7
+102,7
@@
class ReadonlyImageEditForm(ImageEditForm):
class ImportForm(forms.Form):
class ImportForm(forms.Form):
- source_url = forms.URLField(label=_('WikiCommons, MNW
or Flickr
URL'))
+ source_url = forms.URLField(label=_('WikiCommons, MNW
, Flickr, RawPixel
URL'))
def clean_source_url(self):
url = self.cleaned_data['source_url']
def clean_source_url(self):
url = self.cleaned_data['source_url']
@@
-103,3
+113,4
@@
class ImportForm(forms.Form):
for field_name in ('license_url', 'license_name', 'author', 'title', 'download_url'):
self.cleaned_data[field_name] = import_data[field_name]
return import_data['source_url']
for field_name in ('license_url', 'license_name', 'author', 'title', 'download_url'):
self.cleaned_data[field_name] = import_data[field_name]
return import_data['source_url']
+