diff options
| -rw-r--r-- | coip/apps/name/models.py | 1 | ||||
| -rw-r--r-- | coip/apps/userprofile/views.py | 6 | ||||
| -rw-r--r-- | templates/apps/userprofile/home.html | 18 |
3 files changed, 21 insertions, 4 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}) diff --git a/templates/apps/userprofile/home.html b/templates/apps/userprofile/home.html index d769f6b..d635e53 100644 --- a/templates/apps/userprofile/home.html +++ b/templates/apps/userprofile/home.html @@ -6,13 +6,17 @@ $(function() { $("#memberships").accordion({ header: 'h3' }); + $("#names").accordion({ + header: 'h3' + }); }); </script> {% endblock %} {% block headline %}{{profile.display_name}}{% endblock %} {% block title %}COIP - {{profile.display_name}} - Home{% endblock %} {% block main %} -<div id="memberships"> +<h3>Memberships</h3> +<div id="memberships" style="width: 60%;"> {% for m in memberships %} <div id="m{{m.id}}" class="{{m.status}}"> <h3 style="padding-left: 20px;">{{m.name.shortname}}</h3> @@ -24,4 +28,16 @@ $(function() { </div> {% endfor %} </div> +<h3>Names</h3> +<div id="names" style="width: 60%;"> + {% for n,p in names %} + <div id="n{{n.id}}""> + <h3 style="padding-left: 20px;">{{n.shortname}}</h3> + <div> + You are allowed to {{p}} {{n.shortname}}<br/> + <a href="/name/id/{{n.id}}">More details about {{n.shortname}}...</a> + </div> + </div> + {% endfor %} +</div> {% endblock %}
\ No newline at end of file |