From patchwork Sat Nov 28 12:14:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 549639 X-Patchwork-Delegate: stephen.finucane@intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E9FF91401F0 for ; Sat, 28 Nov 2015 23:15:57 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id C03FA1A0771 for ; Sat, 28 Nov 2015 23:15:57 +1100 (AEDT) X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id DC94C1A032F for ; Sat, 28 Nov 2015 23:15:08 +1100 (AEDT) Received: from [179.182.162.78] (helo=smtp.w2.samsung.com) by bombadil.infradead.org with esmtpsa (Exim 4.80.1 #2 (Red Hat Linux)) id 1a2ePB-0005Cs-Ms; Sat, 28 Nov 2015 12:15:06 +0000 Received: from mchehab by smtp.w2.samsung.com with local (Exim 4.86) (envelope-from ) id 1a2eOw-0001AE-UX; Sat, 28 Nov 2015 10:14:50 -0200 From: Mauro Carvalho Chehab To: Subject: [PATCH 05/10] models: Add priority field to DelegationRule Date: Sat, 28 Nov 2015 10:14:41 -0200 Message-Id: <1448712886-3221-6-git-send-email-mchehab@osg.samsung.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1448712886-3221-1-git-send-email-mchehab@osg.samsung.com> References: <1448712886-3221-1-git-send-email-mchehab@osg.samsung.com> X-BeenThere: patchwork@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Patchwork development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Patchwork ML , Laurent Pinchart , Mauro Carvalho Chehab MIME-Version: 1.0 Errors-To: patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Patchwork" From: Laurent Pinchart The priority allows sorting delegation rules according to their priorities. Higher priority rules will be evaluated first. Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab Acked-by: Stephen Finucane --- patchwork/admin.py | 2 +- patchwork/models.py | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/patchwork/admin.py b/patchwork/admin.py index e05c8bc7cf03..216cdf583968 100644 --- a/patchwork/admin.py +++ b/patchwork/admin.py @@ -4,7 +4,7 @@ from patchwork.models import Project, Person, UserProfile, State, Patch, \ class DelegationRuleInline(admin.TabularInline): model = DelegationRule - fields = ('path', 'user') + fields = ('path', 'user', 'priority') class ProjectAdmin(admin.ModelAdmin): list_display = ('name', 'linkname','listid', 'listemail') diff --git a/patchwork/models.py b/patchwork/models.py index 1bd9af24b510..101a9af9746f 100644 --- a/patchwork/models.py +++ b/patchwork/models.py @@ -82,10 +82,15 @@ class DelegationRule(models.Model): user = models.ForeignKey(User) path = models.CharField(max_length=255) project = models.ForeignKey(Project) + priority = models.IntegerField(default = 0) def __unicode__(self): return self.path + class Meta: + ordering = ['-priority', 'path'] + unique_together = (('path', 'project')) + class UserProfile(models.Model): user = models.OneToOneField(User, unique = True, related_name='profile') primary_project = models.ForeignKey(Project, null = True, blank = True)