minor code style

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

diff --git a/apps/catalogue/forms.py b/apps/catalogue/forms.py
index 285e58e..4b1214f 100644 (file)
--- a/apps/catalogue/forms.py
+++ b/apps/catalogue/forms.py
@@ -9,44 +9,47 @@ from django import forms
 from django.utils.translation import ugettext_lazy as _
 
 from catalogue.constants import MASTERS
 from django.utils.translation import ugettext_lazy as _
 
 from catalogue.constants import MASTERS

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

 
 

-class DocumentCreateForm(forms.ModelForm):
+class DocumentCreateForm(forms.Form):

     """
         Form used for creating new documents.
     """
     """
         Form used for creating new documents.
     """

-    file = forms.FileField(required=False)
-    template = forms.ModelChoiceField(Template.objects, required=False)
-    text = forms.CharField(required=False, widget=forms.Textarea)
-
-    class Meta:
-        model = Book
-        exclude = ['parent', 'parent_number', 'project']
-
-    def __init__(self, *args, **kwargs):
-        super(DocumentCreateForm, self).__init__(*args, **kwargs)
-        self.fields['slug'].widget.attrs={'class': 'autoslug'}
-        self.fields['gallery'].widget.attrs={'class': 'autoslug'}
-        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()
-        file = self.cleaned_data['file']
-        template = self.cleaned_data['template']
-
-        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."))
-        elif template is not None:
-            self.cleaned_data['text'] = template.content
-
-        if not self.cleaned_data["text"]:
-            self._errors["file"] = self.error_class([_("You must enter text, upload a file or select a template")])
-
-        return self.cleaned_data
+    owner_organization = forms.CharField(required=False)
+    title = forms.CharField(required=True)
+    language = forms.CharField(required=True)
+    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)
+
+    #class Meta:
+        #model = Book
+        #exclude = ['parent', 'parent_number', 'project', 'gallery', 'public']
+
+    #def __init__(self, *args, org=None, **kwargs):
+    #    super(DocumentCreateForm, self).__init__(*args, **kwargs)
+        #self.fields['slug'].widget.attrs={'class': 'autoslug'}
+        #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']
+        #self.cleaned_data['gallery'] = self.cleaned_data['slug']
+
+        #~ 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):


@@ -71,38 +74,20 @@ class DocumentsUploadForm(forms.Form):
         return self.cleaned_data
 
 
         return self.cleaned_data
 
 

-class ChunkForm(forms.ModelForm):
+class DocumentForm(forms.ModelForm):

     """
         Form used for editing a chunk.
     """
     user = forms.ModelChoiceField(queryset=
     """
         Form used for editing a chunk.
     """
     user = forms.ModelChoiceField(queryset=

-        User.objects.annotate(count=Count('chunk')).
-        order_by('last_name', 'first_name'), required=False,
+        User.objects.order_by('last_name', 'first_name'), required=False,

         label=_('Assigned to')) 
 
     class Meta:
         label=_('Assigned to')) 
 
     class Meta:

-        model = Chunk
-        fields = ['title', 'slug', 'gallery_start', 'user', 'stage']
-        exclude = ['number']
+        model = Document
+        fields = ['user', 'stage']

 
 

-    def __init__(self, *args, **kwargs):
-        super(ChunkForm, self).__init__(*args, **kwargs)
-        self.fields['gallery_start'].widget.attrs={'class': 'number-input'}
-        self.fields['slug'].widget.attrs={'class': 'autoslug'}
-        self.fields['title'].widget.attrs={'class': 'autoslug-source'}

 
 

-    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):
+class DocumentAddForm(DocumentForm):

     """
         Form used for adding a chunk to a document.
     """
     """
         Form used for adding a chunk to a document.
     """


@@ -116,25 +101,11 @@ class ChunkAddForm(ChunkForm):
         raise forms.ValidationError(_('Chunk with this slug already exists'))
 
 
         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"))
-
-    def __init__(self, book, *args, **kwargs):
-        ret =  super(BookAppendForm, self).__init__(*args, **kwargs)
-        self.fields['append_to'].queryset = Book.objects.exclude(pk=book.pk)
-        return ret
-
-

 class BookForm(forms.ModelForm):
     """Form used for editing a Book."""
 
     class Meta:
 class BookForm(forms.ModelForm):
     """Form used for editing a Book."""
 
     class Meta:

-        model = Book
+        model = Document

         exclude = ['project']
 
     def __init__(self, *args, **kwargs):
         exclude = ['project']
 
     def __init__(self, *args, **kwargs):


@@ -160,3 +131,10 @@ class ChooseMasterForm(forms.Form):
     """
 
     master = forms.ChoiceField(choices=((m, m) for m in MASTERS))
     """
 
     master = forms.ChoiceField(choices=((m, m) for m in MASTERS))

+
+
+class DocumentForkForm(forms.Form):
+    """
+        Form used for forking documents.
+    """
+    owner_organization = forms.CharField(required=False)