[PATCH 05/10] models: Add priority field to DelegationRule
Mauro Carvalho Chehab
mchehab at osg.samsung.com
Sat Nov 28 23:14:41 AEDT 2015
From: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
The priority allows sorting delegation rules according to their
priorities. Higher priority rules will be evaluated first.
Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at osg.samsung.com>
---
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)
--
2.5.0
More information about the Patchwork
mailing list