summaryrefslogtreecommitdiffstats
path: root/apps/patchwork/models.py
diff options
context:
space:
mode:
authorStephen Finucane <stephenfinucane@hotmail.com>2015-04-07 22:20:48 +0100
committerJeremy Kerr <jk@ozlabs.org>2015-05-03 13:46:52 +0800
commita48f76a2d3a98c21d4b37f19cf84073e77db55c8 (patch)
treec91e98b4f522f0ec8072d19d89a3bae64040a2e0 /apps/patchwork/models.py
parent3d74843a8982926ab4ce310ed937a4f41ee36810 (diff)
downloadpatchwork-a48f76a2d3a98c21d4b37f19cf84073e77db55c8.tar.bz2
patchwork-a48f76a2d3a98c21d4b37f19cf84073e77db55c8.tar.xz
Resolve removed 'AUTH_PROFILE_MODULE' setting
The 'AUTH_PROFILE_MODULE' setting, and the 'get_profile()' method on the 'User' model are removed in Django 1.7. This causes errors when using Patchwork with Django 1.7+. There are three changes necessary: * Replace profile model's 'ForeignKey' with a 'OneToOneField' * Remove all 'get_profile()' calls * Delete 'AUTH_PROFILE_MODULE' settings from 'settings.py' These changes are discussed here: http://deathofagremmie.com/2014/05/24/retiring-get-profile-and-auth-profile-module/ Django 1.6 also introduces two other notable changes: * The 'XViewMiddleware' module has been moved * A new test runner has been introduced It is not possible to fix these issues without breaking compatibility with Django 1.5. As a result they have been ignored and must be resolved in a future release. Signed-off-by: Stephen Finucane <stephenfinucane@hotmail.com> Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'apps/patchwork/models.py')
-rw-r--r--apps/patchwork/models.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/apps/patchwork/models.py b/apps/patchwork/models.py
index 4bed9b8..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:
@@ -63,14 +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')
@@ -94,7 +94,6 @@ class UserProfile(models.Model):
submitter__in = submitters)
.values('project_id').query)
-
def sync_person(self):
pass
@@ -121,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()