X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/1a2a6714d405526c16ac4f0900b6dfb0c4c83b6a..3ed70e460bfde9667995b2e15ef14b8e25e6db15:/apps/explorer/forms.py?ds=sidebyside diff --git a/apps/explorer/forms.py b/apps/explorer/forms.py index c6aa09d2..33585bce 100644 --- a/apps/explorer/forms.py +++ b/apps/explorer/forms.py @@ -1,12 +1,14 @@ # -*- coding: utf-8 -*- -from django import forms - -from lxml import etree +import os from librarian import dcparser + +from django import forms +from django.conf import settings import django.utils from explorer import models + class PersonField(forms.CharField): def clean(self, value): try: @@ -61,7 +63,7 @@ class MergeForm(forms.Form): class BookUploadForm(forms.Form): file = forms.FileField(label='Source OCR file') - bookname = forms.RegexField(regex='[0-9\w_-]+', \ + bookname = forms.RegexField(regex=r'[0-9\.\w_-]+', \ label='Publication name', help_text='Example: slowacki-beniowski') autoxml = forms.BooleanField(required=False, initial=True, label=u"Generate DublinCore template") @@ -73,12 +75,23 @@ class ImageFoldersForm(forms.Form): self.fields['folders'].choices = [('', '-- Wybierz folder z obrazkami --')] + [(fn, fn) for fn in models.get_image_folders()] class SplitForm(forms.Form): - partname = forms.RegexField(regex='[0-9\w_-]+', \ + partname = forms.RegexField(regex='[0-9\.\w_-]+', \ label='Part name', help_text='Example: rozdział-2') autoxml = forms.BooleanField(required=False, initial=False, label=u"Split as new publication") fulltext = forms.CharField(widget=forms.HiddenInput(), required=False) splittext = forms.CharField(widget=forms.HiddenInput(), required=False) +class GalleryChoiceForm(forms.ModelForm): + subpath = forms.ChoiceField(choices=()) + + def __init__(self, *args, **kwargs): + super(GalleryChoiceForm, self).__init__(*args, **kwargs) + self.fields['subpath'].choices = [(settings.IMAGE_DIR + '/' + x, x) for x in os.listdir(settings.MEDIA_ROOT + settings.IMAGE_DIR)] + + class Meta: + model = models.GalleryForDocument + fields = ('document', 'subpath',) + class DublinCoreForm(forms.Form): about = forms.URLField(verify_exists=False) author = PersonField() @@ -95,7 +108,7 @@ class DublinCoreForm(forms.Form): source_name = forms.CharField(widget=forms.Textarea, required=False) source_url = forms.URLField(verify_exists=False, required=False) url = forms.URLField(verify_exists=False) - parts = forms.CharField(widget=forms.Textarea, required=False) + parts = ListField(required=False) license = forms.CharField(required=False) license_description = forms.CharField(widget=forms.Textarea, required=False) @@ -109,4 +122,5 @@ class DublinCoreForm(forms.Form): vdict = info.to_dict() for name in self.fields.keys(): if vdict.has_key(name): - self.fields[name].initial = vdict[name] \ No newline at end of file + self.fields[name].initial = vdict[name] +