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 1SmvSl-0008IJ-03 for garchives@archives.gentoo.org; Thu, 05 Jul 2012 23:27:55 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1052CE0746; Thu, 5 Jul 2012 23:27:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C5364E0746 for ; Thu, 5 Jul 2012 23:27:12 +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 D25851B409E for ; Thu, 5 Jul 2012 23:27:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C699BE5446 for ; Thu, 5 Jul 2012 23:27:09 +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: <1341527580.8124e7c496ed6ae98915aab023d8cc1075191570.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: 8124e7c496ed6ae98915aab023d8cc1075191570 X-VCS-Branch: master Date: Thu, 5 Jul 2012 23:27:09 +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: 8130f614-1351-4d7c-9e91-11943d33b214 X-Archives-Hash: 7686c37610d1f6ca600f10fbf06c025c commit: 8124e7c496ed6ae98915aab023d8cc1075191570 Author: Slava Bacherikov bacher09 org> AuthorDate: Thu Jul 5 22:33:00 2012 +0000 Commit: Slava Bacherikov bacherikov org ua> CommitDate: Thu Jul 5 22:33:00 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoo-packag= es.git;a=3Dcommit;h=3D8124e7c4 Change admin for stats. --- gpackages/apps/packages/admin.py | 46 ++++++++++++++------------------= ----- 1 files changed, 18 insertions(+), 28 deletions(-) diff --git a/gpackages/apps/packages/admin.py b/gpackages/apps/packages/a= dmin.py index 6143cd2..9cfb4ad 100644 --- a/gpackages/apps/packages/admin.py +++ b/gpackages/apps/packages/admin.py @@ -6,25 +6,6 @@ from models import EbuildModel, PackageModel, LicenseMod= el, CategoryModel, \ VirtualPackageModel, RepositoryFeedModel, \ RepositorySourceModel, LicenseGroupModel, PortageNews= Model =20 -class AbstractAnnotateAdmin(object): - annotate_dict =3D {} - - def queryset(self, request): - return super(AbstractAnnotateAdmin, self).queryset(request) \ - .annotate(**self.annotate_dict) - -class EbuildsCountAdmin(AbstractAnnotateAdmin): - annotate_dict =3D {'ebuilds_count': Count('ebuildmodel')} - =20 - def ebuilds_count(self, obj): - return obj.ebuilds_count - -class PackagesCountAdmin(AbstractAnnotateAdmin): - annotate_dict =3D {'packages_count': Count('packagemodel')} - - def packages_count(self, obj): - return obj.packages_count - class KeywordAdmin(admin.TabularInline): model =3D Keyword=20 =20 @@ -45,20 +26,23 @@ class VirtualPackageAdmin(admin.ModelAdmin): search_fields =3D ('name','category__category') list_select_related =3D True =20 -class PackageAdmin(EbuildsCountAdmin, admin.ModelAdmin): +class PackageAdmin(admin.ModelAdmin): list_display =3D ('__unicode__', 'ebuilds_count') list_filter =3D ('created_datetime', 'updated_datetime', 'herds') list_select_related =3D True =20 -class HerdsAdmin(PackagesCountAdmin, admin.ModelAdmin): - list_display =3D ('name', 'email', 'description', 'packages_count') +class HerdsAdmin(admin.ModelAdmin): + list_display =3D ('name', 'email', 'description', 'packages_count', + 'ebuilds_count', 'maintainers_count',) + # 'repositories_count') search_fields =3D ('name', 'email') =20 -class MaintainerAdmin(PackagesCountAdmin, admin.ModelAdmin): - list_display =3D ('name', 'email', 'packages_count') +class MaintainerAdmin(admin.ModelAdmin): + list_display =3D ('name', 'email', 'packages_count', 'ebuilds_count'= , + 'herds_count') search_fields =3D ('name', 'email') =20 -class UseFlagAdmin(EbuildsCountAdmin, admin.ModelAdmin): +class UseFlagAdmin(admin.ModelAdmin): list_display =3D ('name', 'description', 'ebuilds_count') search_fields =3D ('name', 'description') =20 @@ -70,12 +54,13 @@ class HomepageAdmin(admin.ModelAdmin): list_display =3D ('url',) search_fields =3D ('url',) =20 -class LicenseAdmin(EbuildsCountAdmin, admin.ModelAdmin): +class LicenseAdmin(admin.ModelAdmin): list_display =3D ('name', 'ebuilds_count') search_fields =3D ('name',) =20 class RepositoryAdmin(admin.ModelAdmin): - list_display =3D ('name', 'updated_datetime', 'official', 'homepage'= , 'quality') + list_display =3D ('name', 'updated_datetime', 'official', 'homepage'= ,=20 + 'quality', 'packages_count', 'ebuilds_count') search_fields =3D ('name', 'description', 'owner_name', 'owner_email= ') list_filter =3D ('created_datetime', 'updated_datetime', 'official',= 'quality') date_hierarchy =3D 'updated_datetime' @@ -98,13 +83,18 @@ class PortageNewsAdmin(admin.ModelAdmin): search_fields =3D ('name', 'title', 'message') date_hierarchy =3D 'date' =20 +class CategoryAdmin(admin.ModelAdmin): + list_display =3D ('category', 'virtual_packages_count', 'packages_co= unt', + 'ebuilds_count', 'repositories_count') + search_fields =3D ('category', 'description') + =20 admin.site.register(EbuildModel, EbuildAdmin) admin.site.register(VirtualPackageModel, VirtualPackageAdmin) admin.site.register(PackageModel, PackageAdmin) admin.site.register(LicenseModel, LicenseAdmin) admin.site.register(LicenseGroupModel) -admin.site.register(CategoryModel) +admin.site.register(CategoryModel, CategoryAdmin) admin.site.register(UseFlagModel, UseFlagAdmin) admin.site.register(UseFlagDescriptionModel, UseFlagDescriptionAdmin) admin.site.register(RepositoryModel, RepositoryAdmin)