error reporting

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

diff --git a/apps/catalogue/forms.py b/apps/catalogue/forms.py
index 33ccbe6..9301d9b 100644 (file)
--- a/apps/catalogue/forms.py
+++ b/apps/catalogue/forms.py
@@ -3,40 +3,53 @@
 # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

-from django.contrib.auth.models import User
-from django.db.models import Count
+from catalogue.models import Category
+from catalogue.models import User

 from django import forms
 from django.utils.translation import ugettext_lazy as _
 
 from catalogue.constants import MASTERS
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 
 from catalogue.constants import MASTERS

-from catalogue.models import Book, Chunk
+from catalogue.models import Document

 
 

-class DocumentCreateForm(forms.ModelForm):
-    """
-        Form used for creating new documents.
-    """
-    file = forms.FileField(required=False)
-    text = forms.CharField(required=False, widget=forms.Textarea)
-
-    class Meta:
-        model = Book
-        exclude = ['gallery', 'parent', 'parent_number']
-        prepopulated_fields = {'slug': ['title']}
-
-    def clean(self):
-        super(DocumentCreateForm, self).clean()
-        file = self.cleaned_data['file']

 
 

-        if file is not None:
-            try:
-                self.cleaned_data['text'] = file.read().decode('utf-8')
-            except UnicodeDecodeError:
-                raise forms.ValidationError("Text file must be UTF-8 encoded.")
+def tag_field(category_tag, required=True):
+    category = Category.objects.get(dc_tag=category_tag)
+    return forms.ModelMultipleChoiceField(queryset=category.tag_set.all(), required=required)

 
 

-        if not self.cleaned_data["text"]:
-            raise forms.ValidationError("You must either enter text or upload a file")

 
 

-        return self.cleaned_data
+class DocumentCreateForm(forms.Form):
+    """
+        Form used for creating new documents.
+    """
+    owner_organization = forms.CharField(required=False)
+    title = forms.CharField()
+    language = forms.CharField()
+    publisher = forms.CharField(required=False)
+    description = forms.CharField(required=False)
+    rights = forms.CharField(required=False)
+    audience = forms.CharField()
+    
+    cover = forms.FileField(required=False)
+    
+    # summary = forms.CharField(required=True)
+    # template = forms.ModelChoiceField(Template.objects, required=False)
+    #
+    # def __init__(self, *args, org=None, **kwargs):
+    #     super(DocumentCreateForm, self).__init__(*args, **kwargs)
+    #     self.fields['title'].widget.attrs={'class': 'autoslug-source'}
+    #     self.fields['template'].queryset = Template.objects.filter(is_main=True)
+    #
+    # def clean(self):
+    #     super(DocumentCreateForm, self).clean()
+    #     template = self.cleaned_data['template']
+    #
+    #     if template is not None:
+    #         self.cleaned_data['text'] = template.content
+    #
+    #     if not self.cleaned_data.get("text"):
+    #         self._errors["template"] = self.error_class([_("You must select a template")])
+    #
+    #     return self.cleaned_data

 
 
 class DocumentsUploadForm(forms.Form):
 
 
 class DocumentsUploadForm(forms.Form):


@@ -44,6 +57,9 @@ class DocumentsUploadForm(forms.Form):
         Form used for uploading new documents.
     """
     file = forms.FileField(required=True, label=_('ZIP file'))
         Form used for uploading new documents.
     """
     file = forms.FileField(required=True, label=_('ZIP file'))

+    dirs = forms.BooleanField(
+        label=_('Directories are documents in chunks'),
+        widget=forms.CheckboxInput(attrs={'disabled': 'disabled'}))

 
     def clean(self):
         file = self.cleaned_data['file']
 
     def clean(self):
         file = self.cleaned_data['file']


@@ -59,66 +75,16 @@ class DocumentsUploadForm(forms.Form):
         return self.cleaned_data
 
 
         return self.cleaned_data
 
 

-class ChunkForm(forms.ModelForm):
-    """
-        Form used for editing a chunk.
-    """
-    user = forms.ModelChoiceField(queryset=
-        User.objects.annotate(count=Count('chunk')).
-        order_by('-count', 'last_name', 'first_name'))
-
-
-    class Meta:
-        model = Chunk
-        exclude = ['number']
-
-    def clean_slug(self):
-        slug = self.cleaned_data['slug']
-        try:
-            chunk = Chunk.objects.get(book=self.instance.book, slug=slug)
-        except Chunk.DoesNotExist:
-            return slug
-        if chunk == self.instance:
-            return slug
-        raise forms.ValidationError(_('Chunk with this slug already exists'))
-
-
-class ChunkAddForm(ChunkForm):
-    """
-        Form used for adding a chunk to a document.
-    """
-
-    def clean_slug(self):
-        slug = self.cleaned_data['slug']
-        try:
-            user = Chunk.objects.get(book=self.instance.book, slug=slug)
-        except Chunk.DoesNotExist:
-            return slug
-        raise forms.ValidationError(_('Chunk with this slug already exists'))
-
-
-class BookAppendForm(forms.Form):
-    """
-        Form for appending a book to another book.
-        It means moving all chunks from book A to book B and deleting A.
-    """
-
-    append_to = forms.ModelChoiceField(queryset=Book.objects.all(),
-        label=_("Append to"))
-
-
-class BookForm(forms.ModelForm):
+class ChooseMasterForm(forms.Form):

     """
     """

-        Form used for editing a Book.
+        Form used for fixing the chunks in a book.

     """
 
     """
 

-    class Meta:
-        model = Book
+    master = forms.ChoiceField(choices=((m, m) for m in MASTERS))

 
 
 
 

-class ChooseMasterForm(forms.Form):
+class DocumentForkForm(forms.Form):

     """
     """

-        Form used for fixing the chunks in a book.
+        Form used for forking documents.

     """
     """

-
-    master = forms.ChoiceField(choices=((m, m) for m in MASTERS))
+    owner_organization = forms.CharField(required=False)