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 55b1e54..e153f7e 100644 (file)
--- a/apps/wiki/forms.py
+++ b/apps/wiki/forms.py
@@ -3,12 +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.
 #
 # 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 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 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):
     """
 
 class DocumentTagForm(forms.Form):
     """


@@ -40,7 +42,8 @@ class DocumentCreateForm(forms.ModelForm):
 
     class Meta:
         model = Book
 
     class Meta:
         model = Book

-        exclude = ['gallery']
+        exclude = ['gallery', 'parent', 'parent_number']
+        prepopulated_fields = {'slug': ['title']}

 
     def clean(self):
         super(DocumentCreateForm, self).clean()
 
     def clean(self):
         super(DocumentCreateForm, self).clean()


@@ -153,6 +156,10 @@ class ChunkForm(forms.ModelForm):
     """
         Form used for editing a chunk.
     """
     """
         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
 
     class Meta:
         model = Chunk


@@ -164,7 +171,7 @@ class ChunkForm(forms.ModelForm):
             chunk = Chunk.objects.get(book=self.instance.book, slug=slug)
         except Chunk.DoesNotExist:
             return slug
             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'))
 
             return slug
         raise forms.ValidationError(_('Chunk with this slug already exists'))