diff options
author | Leif Johansson <leifj@sunet.se> | 2010-07-06 21:55:44 +0200 |
---|---|---|
committer | Leif Johansson <leifj@sunet.se> | 2010-07-06 21:55:44 +0200 |
commit | 7921132788e55c0714af8b33ed2105ff6a1dba54 (patch) | |
tree | df995bce2c95830ccace570e3ec059232fef3ac4 /coip/multiresponse.py | |
parent | 7698ee1fe6bd40108fbe48bb641ea99a5b8f2bef (diff) |
cleanup and working membership list
Diffstat (limited to 'coip/multiresponse.py')
-rw-r--r-- | coip/multiresponse.py | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/coip/multiresponse.py b/coip/multiresponse.py index 9a3d965..2e6dc5a 100644 --- a/coip/multiresponse.py +++ b/coip/multiresponse.py @@ -2,11 +2,10 @@ import coip.mimeparse as mimeparse import re from django.conf import settings from django.shortcuts import render_to_response -from django.core.exceptions import ObjectDoesNotExist -from datetime import datetime -from pprint import pprint from django.http import HttpResponse from django.core import serializers +from coip.apps.userprofile.utils import user_profile +from pprint import pprint default_suffix_mapping = {"\.htm(l?)$": "text/html", "\.json$": "application/json", @@ -29,20 +28,7 @@ def make_response_dict(request,d={}): if request.user.is_authenticated(): d['user'] = request.user - profile = None - try: - profile = request.user.profile.get(); - except ObjectDoesNotExist: - profile = UserProfile() - d['profile'] = profile - - #d['stomp_host'] = STOMP_HOST - #d['stomp_port'] = STOMP_PORT - #d['orbited_prefix'] = ORBITED_PREFIX - #d['announce_url'] = ANNOUNCE_URL - #d['date'] = timeAsrfc822(datetime.now()) - #if DEBUG is not None: - # d['debug'] = True + d['profile'] = user_profile(request) return d |