diff -r 9a854bb09f34 -r a0fa17c48236 src/hdalab/views/profile.py --- a/src/hdalab/views/profile.py Thu Sep 25 17:14:29 2014 +0200 +++ b/src/hdalab/views/profile.py Fri Sep 26 12:55:35 2014 +0200 @@ -45,6 +45,10 @@ def update_context(self, context, renkan_queryset): + filter_title = self.request.GET.get("filter", "") + if(len(filter_title)>0): + renkan_queryset = renkan_queryset.filter(renkan__title__icontains=filter_title) + sort_param = self.request.GET.get('sort', "date") order_param = self.request.GET.get('order', "desc") sort = {"date":"renkan__modification_date", "title":"renkan__title", "state":"state", "user":"renkan__owner__username"}.get(sort_param) @@ -55,8 +59,8 @@ order = "" opposite = "desc" - rl = renkan_queryset.order_by(order + sort) - p = Paginator(rl, settings.RENKANS_PER_PAGE) + renkan_queryset = renkan_queryset.order_by(order + sort) + p = Paginator(renkan_queryset, settings.RENKANS_PER_PAGE) page_nb = self.request.GET.get('page') try: page = p.page(page_nb) @@ -65,7 +69,7 @@ except EmptyPage: page = p.page(p.num_pages) - context.update({"page": page, "sort_param":sort_param, "order_param":order_param, "opposite":opposite}) + context.update({"page": page, "sort_param":sort_param, "order_param":order_param, "opposite":opposite, "filter":filter_title}) return context @@ -76,7 +80,7 @@ template_name = "profile_home.html" def get_context_data(self, **kwargs): - return self.update_context( super(ProfileHome, self).get_context_data(**kwargs), HdalabRenkan.objects.select_related("renkan").filter(renkan__owner=self.request.user) ) + return self.update_context( super(ProfileHome, self).get_context_data(**kwargs), HdalabRenkan.objects.select_related("renkan").filter(renkan__owner=self.request.user)) class RenkanPublicList(BaseRenkanList):