fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
3626b6d
..
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):
"""
@@
-154,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