fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor fix
[redakcja.git]
/
apps
/
catalogue
/
templatetags
/
book_list.py
diff --git
a/apps/catalogue/templatetags/book_list.py
b/apps/catalogue/templatetags/book_list.py
index
f7e7047
..
6e64ed6
100755
(executable)
--- a/
apps/catalogue/templatetags/book_list.py
+++ b/
apps/catalogue/templatetags/book_list.py
@@
-1,21
+1,21
@@
+# -*- coding: utf-8 -*-
from __future__ import absolute_import
from __future__ import absolute_import
-from re import split
from django.db.models import Q, Count
from django import template
from django.utils.translation import ugettext_lazy as _
from django.contrib.auth.models import User
from django.db.models import Q, Count
from django import template
from django.utils.translation import ugettext_lazy as _
from django.contrib.auth.models import User
-from catalogue.models import Chunk
+from catalogue.models import Chunk
, Project
register = template.Library()
class ChunksList(object):
def __init__(self, chunk_qs):
register = template.Library()
class ChunksList(object):
def __init__(self, chunk_qs):
- #self.chunk_qs = chunk_qs#.annotate(
-
#
book_length=Count('book__chunk')).select_related(
-
#
'book')#, 'stage__name',
-
#
'user')
+ #
self.chunk_qs = chunk_qs#.annotate(
+
#
book_length=Count('book__chunk')).select_related(
+
#
'book')#, 'stage__name',
+
#
'user')
self.chunk_qs = chunk_qs.select_related('book__hidden')
self.book_qs = chunk_qs.values('book_id')
self.chunk_qs = chunk_qs.select_related('book__hidden')
self.book_qs = chunk_qs.values('book_id')
@@
-111,8
+111,9
@@
def document_list_filter(request, **kwargs):
chunks = chunks.filter(_states_dict[state])
chunks = foreign_filter(chunks, arg_or_GET('user'), 'user', User, 'username')
chunks = chunks.filter(_states_dict[state])
chunks = foreign_filter(chunks, arg_or_GET('user'), 'user', User, 'username')
- chunks = foreign_filter(chunks, arg_or_GET('stage'), 'stage', Chunk.tag_model
, 'slug'
)
+ chunks = foreign_filter(chunks, arg_or_GET('stage'), 'stage', Chunk.tag_model)
chunks = search_filter(chunks, arg_or_GET('title'), ['book__title', 'title'])
chunks = search_filter(chunks, arg_or_GET('title'), ['book__title', 'title'])
+ chunks = foreign_filter(chunks, arg_or_GET('project'), 'book__project', Project, 'pk')
return chunks
return chunks
@@
-125,9
+126,14
@@
def book_list(context, user=None):
new_context = {"viewed_user": user}
else:
filters = {}
new_context = {"viewed_user": user}
else:
filters = {}
- new_context = {"users": User.objects.annotate(
+ new_context = {
+ "users": User.objects.annotate(
count=Count('chunk')).filter(count__gt=0).order_by(
count=Count('chunk')).filter(count__gt=0).order_by(
- '-count', 'last_name', 'first_name')}
+ '-count', 'last_name', 'first_name'),
+ "other_users": User.objects.annotate(
+ count=Count('chunk')).filter(count=0).order_by(
+ 'last_name', 'first_name'),
+ }
new_context.update({
"filters": True,
new_context.update({
"filters": True,
@@
-135,6
+141,7
@@
def book_list(context, user=None):
"books": ChunksList(document_list_filter(request, **filters)),
"stages": Chunk.tag_model.objects.all(),
"states": _states_options,
"books": ChunksList(document_list_filter(request, **filters)),
"stages": Chunk.tag_model.objects.all(),
"states": _states_options,
+ "projects": Project.objects.all(),
})
return new_context
})
return new_context