Message ID | 1448712886-3221-2-git-send-email-mchehab@osg.samsung.com |
---|---|
State | Accepted |
Delegated to: | Stephen Finucane |
Headers | show |
On 28 Nov 10:14, Mauro Carvalho Chehab wrote: > From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > Delegation rules are used to automatically set the delegate of a patch > based on the files touched by the patch. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com> When combined with the priority field patch... Acked-by: Stephen Finucane <stephen.finucane@intel.com>
On 06 Jan 17:11, Finucane, Stephen wrote: > On 28 Nov 10:14, Mauro Carvalho Chehab wrote: > > From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > > > Delegation rules are used to automatically set the delegate of a patch > > based on the files touched by the patch. > > > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com> > > When combined with the priority field patch... > > Acked-by: Stephen Finucane <stephen.finucane@intel.com> Merged.
diff --git a/patchwork/admin.py b/patchwork/admin.py index eb8daa1eced2..e05c8bc7cf03 100644 --- a/patchwork/admin.py +++ b/patchwork/admin.py @@ -1,9 +1,16 @@ from django.contrib import admin from patchwork.models import Project, Person, UserProfile, State, Patch, \ - Comment, Bundle, Tag + Comment, Bundle, Tag, DelegationRule + +class DelegationRuleInline(admin.TabularInline): + model = DelegationRule + fields = ('path', 'user') class ProjectAdmin(admin.ModelAdmin): list_display = ('name', 'linkname','listid', 'listemail') + inlines = [ + DelegationRuleInline, + ] admin.site.register(Project, ProjectAdmin) class PersonAdmin(admin.ModelAdmin): diff --git a/patchwork/models.py b/patchwork/models.py index c2b8a9c9408d..1bd9af24b510 100644 --- a/patchwork/models.py +++ b/patchwork/models.py @@ -78,6 +78,14 @@ class Project(models.Model): ordering = ['linkname'] +class DelegationRule(models.Model): + user = models.ForeignKey(User) + path = models.CharField(max_length=255) + project = models.ForeignKey(Project) + + def __unicode__(self): + return self.path + class UserProfile(models.Model): user = models.OneToOneField(User, unique = True, related_name='profile') primary_project = models.ForeignKey(Project, null = True, blank = True)