X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=apps%2Fpatchwork%2Fmodels.py;h=54b86566d7bd9a07b0dabb18c978b3d9b44f01f1;hb=a48f76a2d3a98c21d4b37f19cf84073e77db55c8;hp=9de2a22d7e3fca857b53420fa597b781fd5b1bfb;hpb=fd1f5851f960e03a91efd2a93397739ca9473d67;p=patchwork diff --git a/apps/patchwork/models.py b/apps/patchwork/models.py index 9de2a22..54b8656 100644 --- a/apps/patchwork/models.py +++ b/apps/patchwork/models.py @@ -41,7 +41,7 @@ class Person(models.Model): return self.email def link_to_user(self, user): - self.name = user.get_profile().name() + self.name = user.profile.name() self.user = user class Meta: @@ -55,7 +55,7 @@ class Project(models.Model): web_url = models.CharField(max_length=2000, blank=True) scm_url = models.CharField(max_length=2000, blank=True) webscm_url = models.CharField(max_length=2000, blank=True) - send_notifications = models.BooleanField() + send_notifications = models.BooleanField(default=False) def __unicode__(self): return self.name @@ -63,10 +63,14 @@ class Project(models.Model): def is_editable(self, user): if not user.is_authenticated(): return False - return self in user.get_profile().maintainer_projects.all() + return self in user.profile.maintainer_projects.all() + + class Meta: + ordering = ['linkname'] + class UserProfile(models.Model): - user = models.ForeignKey(User, unique = True) + user = models.OneToOneField(User, unique = True, related_name='profile') primary_project = models.ForeignKey(Project, null = True, blank = True) maintainer_projects = models.ManyToManyField(Project, related_name = 'maintainer_project') @@ -90,7 +94,6 @@ class UserProfile(models.Model): submitter__in = submitters) .values('project_id').query) - def sync_person(self): pass @@ -117,7 +120,7 @@ class UserProfile(models.Model): def _user_saved_callback(sender, created, instance, **kwargs): try: - profile = instance.get_profile() + profile = instance.profile except UserProfile.DoesNotExist: profile = UserProfile(user = instance) profile.save()