diff options
author | Leif Johansson <leifj@sunet.se> | 2011-08-16 09:59:58 +0200 |
---|---|---|
committer | Leif Johansson <leifj@sunet.se> | 2011-08-16 09:59:58 +0200 |
commit | 1ad5e8f6b33f42966918d56f04c58e6b1e15357b (patch) | |
tree | ae1214a05802ea00812eaf30e0206d4035b09558 /coip/multiresponse.py | |
parent | 36dad4f8b67948daef92257cea362c5d772279e3 (diff) |
new profiles implementation
Diffstat (limited to 'coip/multiresponse.py')
-rw-r--r-- | coip/multiresponse.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/coip/multiresponse.py b/coip/multiresponse.py index e91e527..0c4f36c 100644 --- a/coip/multiresponse.py +++ b/coip/multiresponse.py @@ -3,11 +3,11 @@ import re from django.conf import settings from django.shortcuts import render_to_response from django.http import HttpResponse, HttpResponseForbidden -from coip.apps.userprofile.utils import user_profile from django.utils import simplejson from django.template import loader from coip.settings import PREFIX_URL from coip.apps.membership.models import has_member +from coip.apps.userprofile.models import user_profile, Identifier default_suffix_mapping = {"\.htm(l?)$": "text/html", "\.json$": "application/json", @@ -30,7 +30,7 @@ def make_response_dict(request,d={}): if request.user.is_authenticated(): d['user'] = request.user - d['profile'] = user_profile(request) + d['profile'] = user_profile(request.user) d['prefix_url'] = PREFIX_URL if d.has_key('name'): @@ -58,7 +58,7 @@ def render403(request,message="You don't seem to have enough rights for what you dict['message'] = message dict['user'] = request.user if request.user.is_authenticated(): - dict['profile'] = user_profile(request) + dict['profile'] = user_profile(request.user) return HttpResponseForbidden(loader.render_to_string("403.html",dict)) def respond_to(request, template_mapping, dict={}, suffix_mapping=default_suffix_mapping): |