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 1SZ3Jo-00074r-Im for garchives@archives.gentoo.org; Mon, 28 May 2012 17:01:20 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73240E0761; Mon, 28 May 2012 17:00:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 46D30E0761 for ; Mon, 28 May 2012 17:00: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 859431B406B for ; Mon, 28 May 2012 17:00:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4110EE5430 for ; Mon, 28 May 2012 17:00:51 +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: <1338203958.f0421b0de870645a8a509a841821fc0c98fa14cb.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/models.py X-VCS-Directories: gpackages/apps/packages/ X-VCS-Committer: bacher09 X-VCS-Committer-Name: Slava Bacherikov X-VCS-Revision: f0421b0de870645a8a509a841821fc0c98fa14cb X-VCS-Branch: master Date: Mon, 28 May 2012 17:00:51 +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: 34f17c1a-569d-43f4-8fd1-6443739c3277 X-Archives-Hash: 592f734eab2d9d61366ea95038a40ecc commit: f0421b0de870645a8a509a841821fc0c98fa14cb Author: Slava Bacherikov bacher09 org> AuthorDate: Mon May 28 11:19:18 2012 +0000 Commit: Slava Bacherikov bacherikov org ua> CommitDate: Mon May 28 11:19:18 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoo-packag= es.git;a=3Dcommit;h=3Df0421b0d Change CategoryModel __nit__ --- gpackages/apps/packages/models.py | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/gpackages/apps/packages/models.py b/gpackages/apps/packages/= models.py index 5278709..ce05e2c 100644 --- a/gpackages/apps/packages/models.py +++ b/gpackages/apps/packages/models.py @@ -1,5 +1,7 @@ from django.db import models =20 +from porttree import Category + class ArchesModel(models.Model): name =3D models.CharField(max_length =3D 12) =20 @@ -9,15 +11,25 @@ class RepositoryModel(models.Model): # And other fields =20 class CategoryModel(models.Model): + def __init__(self, *args, **kwargs): + category_object =3D None + =20 + if len(args)>=3D1: + category_object =3D args[0] + if 'category_object' in kwargs: + category_object =3D kwargs['category_object'] + =20 + if isinstance(category_object, Category): + return super(CategoryModel, self).__init__(category =3D cate= gory_object.category) + else: + return super(CategoryModel, self).__init__(*args, **kwargs) + + category =3D models.CharField(unique =3D True, max_length =3D 70) =20 def __unicode__(self): return self.category =20 - @classmethod - def create_by_category(cls, category): - category_model =3D cls.objects.get_or_create(category =3D catego= ry.category) - return category_model =20 class PackageModel(models.Model): name =3D models.CharField(unique =3D True, max_length =3D 254)