From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1Sl4pA-0002E5-Va for garchives@archives.gentoo.org; Sat, 30 Jun 2012 21:03:25 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 083FDE0759; Sat, 30 Jun 2012 21:02:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CCCE8E0759 for ; Sat, 30 Jun 2012 21:02:42 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4A3141B401C for ; Sat, 30 Jun 2012 21:02:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 98C56E5446 for ; Sat, 30 Jun 2012 21:02:39 +0000 (UTC) From: "Slava Bacherikov" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Slava Bacherikov" Message-ID: <1341086042.4d6ca7250b10ccdbd96e0619db250ed7074f9f27.bacher09@gentoo> Subject: [gentoo-commits] proj/gentoo-packages:master commit in: gpackages/apps/packages/, gpackages/apps/generic/ X-VCS-Repository: proj/gentoo-packages X-VCS-Files: gpackages/apps/generic/views.py gpackages/apps/packages/views.py X-VCS-Directories: gpackages/apps/packages/ gpackages/apps/generic/ X-VCS-Committer: bacher09 X-VCS-Committer-Name: Slava Bacherikov X-VCS-Revision: 4d6ca7250b10ccdbd96e0619db250ed7074f9f27 X-VCS-Branch: master Date: Sat, 30 Jun 2012 21:02:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 282c1e8d-4359-4e87-95fc-e95965d63b04 X-Archives-Hash: a09f57cd7a641db9ff9c2235b7806a25 commit: 4d6ca7250b10ccdbd96e0619db250ed7074f9f27 Author: Slava Bacherikov bacher09 org> AuthorDate: Sat Jun 30 19:54:02 2012 +0000 Commit: Slava Bacherikov bacherikov org ua> CommitDate: Sat Jun 30 19:54:02 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoo-packag= es.git;a=3Dcommit;h=3D4d6ca725 Fix bug in PackageListView with distict --- gpackages/apps/generic/views.py | 5 ++++- gpackages/apps/packages/views.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gpackages/apps/generic/views.py b/gpackages/apps/generic/vie= ws.py index 6beb59e..098c2db 100644 --- a/gpackages/apps/generic/views.py +++ b/gpackages/apps/generic/views.py @@ -63,7 +63,10 @@ class MultipleFilterListViewMixin(object): =20 def __init__(self, *args, **kwargs): super(MultipleFilterListViewMixin, self).__init__(*args, **kwarg= s) - l =3D (x for x in self.allowed_filter.itervalues()) + l =3D [] + for key, val in self.allowed_filter.iteritems(): + if key in self.m2m_filter: + l.append(val) self.m2m_set =3D frozenset(l) =20 def get_queryset(self): diff --git a/gpackages/apps/packages/views.py b/gpackages/apps/packages/v= iews.py index 97e54d6..c77c46e 100644 --- a/gpackages/apps/packages/views.py +++ b/gpackages/apps/packages/views.py @@ -69,7 +69,7 @@ class PackagesListsView(MultipleFilterListViewMixin, Co= ntextListView): 'license': 'ebuildmodel__licenses__name' } =20 - m2m_filter =3D ['herd', 'maintainer', 'ebuildmodel' ] + m2m_filter =3D set(['herd', 'maintainer', 'license']) =20 allowed_order =3D { 'create': 'created_datetime', 'update': 'updated_datetime',