[gentoo-commits] proj/gentoo-packages:master commit in: gpackages/apps/packages/, gpackages/apps/generic/

["Slava Bacherikov" <slava@bacherikov.org.ua>]

commit:     43ed80e696fb1532ca2f6b693e4d9c9daf0fd668
Author:     Slava Bacherikov <slava <AT> bacher09 <DOT> org>
AuthorDate: Fri Jul 13 12:15:57 2012 +0000
Commit:     Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua>
CommitDate: Fri Jul 13 12:33:57 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=43ed80e6

Fix bug with loading keywords from database

---
 gpackages/apps/generic/views.py  |    6 +++---
 gpackages/apps/packages/views.py |   19 ++++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/gpackages/apps/generic/views.py b/gpackages/apps/generic/views.py
index bb0b6c7..e8b5cdc 100644
--- a/gpackages/apps/generic/views.py
+++ b/gpackages/apps/generic/views.py
@@ -73,9 +73,9 @@ class MultipleFilterListViewMixin(object):
     allowed_many = {}
     m2m_filter = set()
 
-    base_queryset = None # should be queryset
-
     def get_queryset(self):
+        query = super(MultipleFilterListViewMixin, self).get_queryset()
+
         qs = filter_req(self.request.GET, self.allowed_filter)
         qs.update(filter_req(self.kwargs, self.allowed_filter))
 
@@ -92,7 +92,7 @@ class MultipleFilterListViewMixin(object):
                 raise Http404('no such order')
 
         qa = dynamic_filter(qs, self.allowed_filter, self.allowed_many)
-        queryset = self.base_queryset.filter(**qa).order_by(order)
+        queryset = query.filter(**qa).order_by(order)
 
         for q in qs.iterkeys():
             if q in self.m2m_filter:

diff --git a/gpackages/apps/packages/views.py b/gpackages/apps/packages/views.py
index 4c9b113..be0ad02 100644
--- a/gpackages/apps/packages/views.py
+++ b/gpackages/apps/packages/views.py
@@ -25,6 +25,10 @@ class ArchesContexView(ArchesViewMixin, ContextView):
         ret.update({'arches': self.get_arches()})
         return ret
 
+    def get_queryset(self):
+        query = super(ArchesContexView, self).get_queryset()
+        return query.prefetch_keywords(self.get_arches())
+
 class ContextArchListView(ArchesContexView, ListView):
     pass
 
@@ -68,8 +72,7 @@ class EbuildsListView(ContextArchListView):
         select_related('package',
                        'package__virtual_package',
                        'package__virtual_package__category'). \
-                       prefetch_related('package__repository'). \
-                       prefetch_keywords(arches)
+                       prefetch_related('package__repository')
 
 class EbuildDetailView(ArchesContexView, DetailView):
     template_name = 'ebuild.html'
@@ -78,8 +81,7 @@ class EbuildDetailView(ArchesContexView, DetailView):
     queryset = EbuildModel.objects.all(). \
         select_related('package',
                        'package__virtual_package',
-                       'package__virtual_package__category'). \
-                       prefetch_keywords(arches)
+                       'package__virtual_package__category')
 
     def get_object(self, queryset = None):
         pk = self.kwargs.get('pk')
@@ -130,11 +132,11 @@ class PackagesListsView(MultipleFilterListViewMixin, ContextArchListView):
     #INNER JOIN packages_virtualpackagemodel vp 
     #ON( `vp`.id = t.virtual_package_id) INNER JOIN `packages_categorymodel` cp
     #ON (vp.category_id = cp.id);
-    base_queryset = PackageModel.objects.all(). \
+    queryset = PackageModel.objects.all(). \
         select_related('virtual_package',
                        'virtual_package__category'). \
-        prefetch_related('repository', 'herds', 'maintainers'). \
-        prefetch_keywords(arches)
+        prefetch_related('repository', 'herds', 'maintainers')
+        #prefetch_keywords(['sparc-solaris', 'sparc64-solaris'])
 
 class PackageDetailView(ArchesContexView, DetailView):
     template_name = 'package.html'
@@ -143,8 +145,7 @@ class PackageDetailView(ArchesContexView, DetailView):
     queryset = PackageModel.objects.all(). \
         select_related('virtual_package',
                        'virtual_package__category'). \
-        prefetch_related('repository'). \
-        prefetch_keywords(arches)
+        prefetch_related('repository')
 
     def get_object(self, queryset = None):
         pk = self.kwargs.get('pk')