X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/f4921ca797953ddab6b35786864b2dd523190503..9249e6ddc35e7cc7077fa5035fbc27397fbb70a9:/apps/wiki/forms.py?ds=sidebyside

diff --git a/apps/wiki/forms.py b/apps/wiki/forms.py
index 55b1e544..e153f7e8 100644
--- 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.
 #
+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):
     """
@@ -40,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()
@@ -153,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
@@ -164,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'))