summaryrefslogtreecommitdiff
path: root/coip/apps
diff options
context:
space:
mode:
authorLeif Johansson <leifj@sunet.se>2010-07-10 01:58:40 +0200
committerLeif Johansson <leifj@sunet.se>2010-07-10 01:58:40 +0200
commit9fa6941d2e811a335477dc0270cde30e9d48a62a (patch)
tree01feea2b86f8bf720d170464669c14b25fcab50d /coip/apps
parente5c38904d1d7e01781c6622ae5ec3d902494deff (diff)
list user writable nodes
Diffstat (limited to 'coip/apps')
-rw-r--r--coip/apps/name/models.py1
-rw-r--r--coip/apps/userprofile/views.py6
2 files changed, 4 insertions, 3 deletions
diff --git a/coip/apps/name/models.py b/coip/apps/name/models.py
index 3a1e2cc..7271e5c 100644
--- a/coip/apps/name/models.py
+++ b/coip/apps/name/models.py
@@ -5,7 +5,6 @@ Created on Jun 24, 2010
'''
from django.db import models
import re
-from twisted.python.reflect import ObjectNotFound
from pprint import pprint
from django.contrib.auth.models import User
from django.core.exceptions import ObjectDoesNotExist
diff --git a/coip/apps/userprofile/views.py b/coip/apps/userprofile/views.py
index fe943d8..2ea4e2a 100644
--- a/coip/apps/userprofile/views.py
+++ b/coip/apps/userprofile/views.py
@@ -12,6 +12,7 @@ from coip.apps.userprofile.utils import user_profile
from django.core.exceptions import ObjectDoesNotExist
from pprint import pprint
from coip.apps.auth.utils import nonce
+from coip.apps.name.models import Name, NameLink
@login_required
def merge(request,pkey=None):
@@ -38,7 +39,8 @@ def home(request):
except ObjectDoesNotExist:
pass
- pprint(memberships)
- return respond_to(request, {'text/html': 'apps/userprofile/home.html'},{'memberships': memberships})
+ names = [(link.src,link.data) for link in NameLink.objects.filter(dst__memberships__user=request.user,type=NameLink.access_control).all()]
+
+ return respond_to(request, {'text/html': 'apps/userprofile/home.html'},{'memberships': memberships,'names': names})