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.60) (envelope-from ) id 1Sc0gg-00048b-QG for garchives@archives.gentoo.org; Tue, 05 Jun 2012 20:49:11 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE4C3E064E; Tue, 5 Jun 2012 20:48:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 661DAE064E for ; Tue, 5 Jun 2012 20:48:53 +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 7575E1B4033 for ; Tue, 5 Jun 2012 20:48:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3C2BFE5436 for ; Tue, 5 Jun 2012 20:48:50 +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: <1338928720.38a340cdefa85a3a5ef62d2767ae0c38f37981d7.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 X-VCS-Directories: gpackages/apps/packages/ X-VCS-Committer: bacher09 X-VCS-Committer-Name: Slava Bacherikov X-VCS-Revision: 38a340cdefa85a3a5ef62d2767ae0c38f37981d7 X-VCS-Branch: master Date: Tue, 5 Jun 2012 20:48:50 +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: 9b4f71e7-d24c-43fe-ade7-2ac541d46de3 X-Archives-Hash: f9225f590e14c94a56efeb3d5bd4190c commit: 38a340cdefa85a3a5ef62d2767ae0c38f37981d7 Author: Slava Bacherikov bacher09 org> AuthorDate: Tue Jun 5 20:38:40 2012 +0000 Commit: Slava Bacherikov bacherikov org ua> CommitDate: Tue Jun 5 20:38:40 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoo-packag= es.git;a=3Dcommit;h=3D38a340cd Update admin for packages --- gpackages/apps/packages/admin.py | 86 ++++++++++++++++++++++++++++++++= +++--- 1 files changed, 80 insertions(+), 6 deletions(-) diff --git a/gpackages/apps/packages/admin.py b/gpackages/apps/packages/a= dmin.py index 08df2c5..b7fe67e 100644 --- a/gpackages/apps/packages/admin.py +++ b/gpackages/apps/packages/admin.py @@ -1,11 +1,85 @@ from django.contrib import admin +from django.db.models import Count from models import EbuildModel, PackageModel, LicensModel, CategoryModel= , \ - UseFlagModel, RepositoryModel, HomepageModel, HerdsM= odel, MaintainerModel + UseFlagModel, RepositoryModel, HomepageModel, HerdsM= odel, \ + MaintainerModel, Keyword, ArchesModel, UseFlagDescrip= tionModel =20 -admin.site.register(EbuildModel) -admin.site.register(PackageModel) -admin.site.register(LicensModel) +class EbuildAdmin(admin.ModelAdmin): + list_display =3D ('__unicode__', 'is_masked', ) + list_filter =3D ('created_datetime','updated_datetime', 'licenses', = 'is_masked') + filter_horizontal =3D ('licenses', 'use_flags', 'homepages') + date_hierarchy =3D 'updated_datetime' + list_select_related =3D True + + +class PackageAdmin(admin.ModelAdmin): + list_display =3D ('__unicode__', 'ebuilds_count') + list_filter =3D ('created_datetime', 'updated_datetime', 'herds') + list_select_related =3D True + + def queryset(self, request): + return super(PackageAdmin, self).queryset(request).annotate(ebui= lds_count =3D Count('ebuildmodel')) + + def ebuilds_count(self, obj): + return obj.ebuilds_count + + +class HerdsAdmin(admin.ModelAdmin): + list_display =3D ('name', 'email', 'description', 'packages_count') + search_fields =3D ('name', 'email') + + def queryset(self, request): + return super(HerdsAdmin, self).queryset(request).annotate(packag= es_count =3D Count('packagemodel')) + =20 + def packages_count(self, obj): + return obj.packages_count + +class MaintainerAdmin(admin.ModelAdmin): + list_display =3D ('name', 'email', 'packages_count') + search_fields =3D ('name', 'email') + + def queryset(self, request): + return super(MaintainerAdmin, self).queryset(request).annotate(p= ackages_count =3D Count('packagemodel')) + + def packages_count(self, obj): + return obj.packages_count + + +class UseFlagAdmin(admin.ModelAdmin): + list_display =3D ('name', 'description', 'ebuilds_count') + search_fields =3D ('name', 'description') + + def queryset(self, request): + return super(UseFlagAdmin, self).queryset(request).annotate(ebui= lds_count =3D Count('ebuildmodel')) + + def ebuilds_count(self, obj): + return obj.ebuilds_count + +class UseFlagDescriptionAdmin(admin.ModelAdmin): + list_display =3D ('use_flag', 'package', 'description') + list_select_related =3D True + +class HomepageAdmin(admin.ModelAdmin): + list_display =3D ('url',) + search_fields =3D ('url',) + +class LicensAdmin(admin.ModelAdmin): + list_display =3D ('name', 'licenses_count') + search_fields =3D ('name',) + + def queryset(self, request): + return super(LicensAdmin, self).queryset(request).annotate(licen= ses_count =3D Count('ebuildmodel')) + =20 + def licenses_count(self, obj): + return obj.licenses_count + +admin.site.register(EbuildModel, EbuildAdmin) +admin.site.register(PackageModel, PackageAdmin) +admin.site.register(LicensModel, LicensAdmin) admin.site.register(CategoryModel) -admin.site.register(UseFlagModel) +admin.site.register(UseFlagModel, UseFlagAdmin) +admin.site.register(UseFlagDescriptionModel, UseFlagDescriptionAdmin) admin.site.register(RepositoryModel) -admin.site.register(HomepageModel) +admin.site.register(HomepageModel, HomepageAdmin) +admin.site.register(HerdsModel, HerdsAdmin) +admin.site.register(MaintainerModel, MaintainerAdmin)