1 |
commit: 4d6ca7250b10ccdbd96e0619db250ed7074f9f27 |
2 |
Author: Slava Bacherikov <slava <AT> bacher09 <DOT> org> |
3 |
AuthorDate: Sat Jun 30 19:54:02 2012 +0000 |
4 |
Commit: Slava Bacherikov <slava <AT> bacherikov <DOT> org <DOT> ua> |
5 |
CommitDate: Sat Jun 30 19:54:02 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-packages.git;a=commit;h=4d6ca725 |
7 |
|
8 |
Fix bug in PackageListView with distict |
9 |
|
10 |
--- |
11 |
gpackages/apps/generic/views.py | 5 ++++- |
12 |
gpackages/apps/packages/views.py | 2 +- |
13 |
2 files changed, 5 insertions(+), 2 deletions(-) |
14 |
|
15 |
diff --git a/gpackages/apps/generic/views.py b/gpackages/apps/generic/views.py |
16 |
index 6beb59e..098c2db 100644 |
17 |
--- a/gpackages/apps/generic/views.py |
18 |
+++ b/gpackages/apps/generic/views.py |
19 |
@@ -63,7 +63,10 @@ class MultipleFilterListViewMixin(object): |
20 |
|
21 |
def __init__(self, *args, **kwargs): |
22 |
super(MultipleFilterListViewMixin, self).__init__(*args, **kwargs) |
23 |
- l = (x for x in self.allowed_filter.itervalues()) |
24 |
+ l = [] |
25 |
+ for key, val in self.allowed_filter.iteritems(): |
26 |
+ if key in self.m2m_filter: |
27 |
+ l.append(val) |
28 |
self.m2m_set = frozenset(l) |
29 |
|
30 |
def get_queryset(self): |
31 |
|
32 |
diff --git a/gpackages/apps/packages/views.py b/gpackages/apps/packages/views.py |
33 |
index 97e54d6..c77c46e 100644 |
34 |
--- a/gpackages/apps/packages/views.py |
35 |
+++ b/gpackages/apps/packages/views.py |
36 |
@@ -69,7 +69,7 @@ class PackagesListsView(MultipleFilterListViewMixin, ContextListView): |
37 |
'license': 'ebuildmodel__licenses__name' |
38 |
} |
39 |
|
40 |
- m2m_filter = ['herd', 'maintainer', 'ebuildmodel' ] |
41 |
+ m2m_filter = set(['herd', 'maintainer', 'license']) |
42 |
|
43 |
allowed_order = { 'create': 'created_datetime', |
44 |
'update': 'updated_datetime', |