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 1SmAKp-0000l6-Lk for garchives@archives.gentoo.org; Tue, 03 Jul 2012 21:08:36 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 96BF5E0603; Tue, 3 Jul 2012 21:08:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 55C6CE0603 for ; Tue, 3 Jul 2012 21:08:13 +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 762891B4063 for ; Tue, 3 Jul 2012 21:08:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 1B89DE543C for ; Tue, 3 Jul 2012 21:08:11 +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: <1341311402.358b177ec765d8dfae6cde6c43add6ae08979e52.bacher09@gentoo> Subject: [gentoo-commits] proj/gentoo-packages:master commit in: gpackages/apps/packages/ X-VCS-Repository: proj/gentoo-packages X-VCS-Files: gpackages/apps/packages/admin.py gpackages/apps/packages/keywords.py gpackages/apps/packages/models.py X-VCS-Directories: gpackages/apps/packages/ X-VCS-Committer: bacher09 X-VCS-Committer-Name: Slava Bacherikov X-VCS-Revision: 358b177ec765d8dfae6cde6c43add6ae08979e52 X-VCS-Branch: master Date: Tue, 3 Jul 2012 21:08:11 +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: 3eada420-7c7c-476e-b4fd-b6ce7ae9443d X-Archives-Hash: c294731ced376e9beb66ba7cdc57aa21 commit: 358b177ec765d8dfae6cde6c43add6ae08979e52 Author: Slava Bacherikov bacher09 org> AuthorDate: Tue Jul 3 10:27:01 2012 +0000 Commit: Slava Bacherikov bacherikov org ua> CommitDate: Tue Jul 3 10:30:02 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoo-packag= es.git;a=3Dcommit;h=3D358b177e Show hardmask in keywords table --- gpackages/apps/packages/admin.py | 2 +- gpackages/apps/packages/keywords.py | 13 ++++++++++--- gpackages/apps/packages/models.py | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/gpackages/apps/packages/admin.py b/gpackages/apps/packages/a= dmin.py index 04a269e..cfeeb80 100644 --- a/gpackages/apps/packages/admin.py +++ b/gpackages/apps/packages/admin.py @@ -34,7 +34,7 @@ class ArchesAdmin(admin.ModelAdmin): =20 class EbuildAdmin(admin.ModelAdmin): list_display =3D ('__unicode__', 'is_hard_masked', ) - list_filter =3D ('created_datetime','updated_datetime', 'licenses', = 'is_hard_masked') + list_filter =3D ('created_datetime','updated_datetime', 'is_hard_mas= ked', 'licenses') filter_horizontal =3D ('licenses', 'use_flags', 'homepages') date_hierarchy =3D 'updated_datetime' list_select_related =3D True diff --git a/gpackages/apps/packages/keywords.py b/gpackages/apps/package= s/keywords.py index 0ab1e87..8b71f77 100644 --- a/gpackages/apps/packages/keywords.py +++ b/gpackages/apps/packages/keywords.py @@ -3,21 +3,28 @@ from package_info.generic import ToStrMixin =20 class KeywordRepr(ToStrMixin): =20 - __slots__ =3D ('status', 'arch') + __slots__ =3D ('status', 'arch', 'hardmask') =20 status_repr_list =3D ('', '+', '~','-') status_class_list =3D ('blank', 'stable', 'unstable', 'hardmask') =20 - def __init__(self, arch, status): + def __init__(self, arch, status, hardmask =3D False): self.arch =3D arch self.status =3D status + self.hardmask =3D hardmask =20 @property def status_repr(self): - return self.status_repr_list[self.status + 1] + st =3D self.status_repr_list[self.status + 1] + if self.hardmask and st: + st =3D 'M' + st + return st =20 @property def status_class(self): + # Maybe set hardmask class only for status > 0=20 + if self.hardmask: + return self.status_class_list[3] return self.status_class_list[self.status + 1] =20 def __unicode__(self): diff --git a/gpackages/apps/packages/models.py b/gpackages/apps/packages/= models.py index 5ce8919..98abc79 100644 --- a/gpackages/apps/packages/models.py +++ b/gpackages/apps/packages/models.py @@ -498,7 +498,7 @@ class EbuildModel(AbstractDateTimeModel): =20 def get_keywords(self, arch_list): keywords_dict =3D self.get_keywords_dict(arch_list) - return (KeywordRepr(arch, keywords_dict[arch]) for arch in arch_= list) + return (KeywordRepr(arch, keywords_dict[arch], self.is_hard_mask= ed) for arch in arch_list) =20 def get_keywords_dict(self, arch_list): arch_set =3D set(arch_list)