django 1.3, comments on books, last activity log, some minor changes

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

diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py
index 7cabe32..e153f7e 100644 (file)
--- a/apps/wiki/forms.py
+++ b/apps/wiki/forms.py
@@ -3,11 +3,14 @@
 # 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 django import forms
-from wiki.models import Book, Chunk
 from django.utils.translation import ugettext_lazy as _
 
 from dvcs.models import Tag
+from wiki.constants import MASTERS
+from wiki.models import Book, Chunk
 
 class DocumentTagForm(forms.Form):
     """
@@ -19,6 +22,17 @@ class DocumentTagForm(forms.Form):
     revision = forms.IntegerField(widget=forms.HiddenInput)
 
 
+class DocumentPubmarkForm(forms.Form):
+    """
+        Form for marking revisions for publishing.
+    """
+
+    id = forms.CharField(widget=forms.HiddenInput)
+    publishable = forms.BooleanField(required=False, initial=True,
+            label=_('Publishable'))
+    revision = forms.IntegerField(widget=forms.HiddenInput)
+
+
 class DocumentCreateForm(forms.ModelForm):
     """
         Form used for creating new documents.
@@ -28,7 +42,8 @@ class DocumentCreateForm(forms.ModelForm):
 
     class Meta:
         model = Book
-        exclude = ['gallery']
+        exclude = ['gallery', 'parent', 'parent_number']
+        prepopulated_fields = {'slug': ['title']}
 
     def clean(self):
         super(DocumentCreateForm, self).clean()
@@ -141,6 +156,10 @@ class ChunkForm(forms.ModelForm):
     """
         Form used for editing a chunk.
     """
+    user = forms.ModelChoiceField(queryset=
+        User.objects.annotate(count=Count('document')).
+        order_by('-count', 'last_name', 'first_name'))
+
 
     class Meta:
         model = Chunk
@@ -152,7 +171,7 @@ class ChunkForm(forms.ModelForm):
             chunk = Chunk.objects.get(book=self.instance.book, slug=slug)
         except Chunk.DoesNotExist:
             return slug
-        if chunk == self:
+        if chunk == self.instance:
             return slug
         raise forms.ValidationError(_('Chunk with this slug already exists'))
 
@@ -179,7 +198,8 @@ class BookAppendForm(forms.Form):
         It means moving all chunks from book A to book B and deleting A.
     """
 
-    append_to = forms.ModelChoiceField(queryset=Book.objects.all())
+    append_to = forms.ModelChoiceField(queryset=Book.objects.all(),
+        label=_("Append to"))
 
 
 class BookForm(forms.ModelForm):
@@ -189,3 +209,11 @@ class BookForm(forms.ModelForm):
 
     class Meta:
         model = Book
+
+
+class ChooseMasterForm(forms.Form):
+    """
+        Form used for fixing the chunks in a book.
+    """
+
+    master = forms.ChoiceField(choices=((m, m) for m in MASTERS))