From a48f76a2d3a98c21d4b37f19cf84073e77db55c8 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 7 Apr 2015 22:20:48 +0100 Subject: 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 Signed-off-by: Jeremy Kerr --- apps/patchwork/views/project.py | 2 +- apps/patchwork/views/user.py | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'apps/patchwork/views') diff --git a/apps/patchwork/views/project.py b/apps/patchwork/views/project.py index 05f0912..114dbe0 100644 --- a/apps/patchwork/views/project.py +++ b/apps/patchwork/views/project.py @@ -29,7 +29,7 @@ def project(request, project_id): context.project = project context['maintainers'] = User.objects.filter( \ - userprofile__maintainer_projects = project) + profile__maintainer_projects = project) context['n_patches'] = Patch.objects.filter(project = project, archived = False).count() context['n_archived_patches'] = Patch.objects.filter(project = project, diff --git a/apps/patchwork/views/user.py b/apps/patchwork/views/user.py index a9d6c4c..126ecc9 100644 --- a/apps/patchwork/views/user.py +++ b/apps/patchwork/views/user.py @@ -86,7 +86,7 @@ def register_confirm(request, conf): person = Person.objects.get(email__iexact = conf.user.email) except Person.DoesNotExist: person = Person(email = conf.user.email, - name = conf.user.get_profile().name()) + name = conf.user.profile.name()) person.user = conf.user person.save() @@ -97,14 +97,14 @@ def profile(request): context = PatchworkRequestContext(request) if request.method == 'POST': - form = UserProfileForm(instance = request.user.get_profile(), + form = UserProfileForm(instance = request.user.profile, data = request.POST) if form.is_valid(): form.save() else: - form = UserProfileForm(instance = request.user.get_profile()) + form = UserProfileForm(instance = request.user.profile) - context.project = request.user.get_profile().primary_project + context.project = request.user.profile.primary_project context['bundles'] = Bundle.objects.filter(owner = request.user) context['profileform'] = form @@ -184,7 +184,7 @@ def todo_lists(request): todo_lists = [] for project in Project.objects.all(): - patches = request.user.get_profile().todo_patches(project = project) + patches = request.user.profile.todo_patches(project = project) if not patches.count(): continue @@ -195,13 +195,13 @@ def todo_lists(request): context = PatchworkRequestContext(request) context['todo_lists'] = todo_lists - context.project = request.user.get_profile().primary_project + context.project = request.user.profile.primary_project return render_to_response('patchwork/todo-lists.html', context) @login_required def todo_list(request, project_id): project = get_object_or_404(Project, linkname = project_id) - patches = request.user.get_profile().todo_patches(project = project) + patches = request.user.profile.todo_patches(project = project) filter_settings = [(DelegateFilter, {'delegate': request.user})] -- cgit v1.2.3