From 061fcaaba6f4cafcd195783e48563c8ddf00c6e6 Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <badger@Clingman.(none)>
Date: Mon, 3 Mar 2008 07:20:08 -0800
Subject: [PATCH] * Changes to allow json to call the method. * Switch to
 returning the group information via jsonProps instead of as a   separate
 value.

---
 fas/fas/templates/user/view.html | 2 +-
 fas/fas/user.py                  | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/fas/fas/templates/user/view.html b/fas/fas/templates/user/view.html
index e22cbb4..697ab04 100644
--- a/fas/fas/templates/user/view.html
+++ b/fas/fas/templates/user/view.html
@@ -45,7 +45,7 @@
     </ul>
     -->
     <ul id="rolespanel" py:if="personal">
-      <py:for each="group in sorted(groups)">
+      <py:for each="group in sorted(person.memberships)">
       <li py:if="auth.canViewGroup(person, group)" class="role">
       <h4>${group.display_name}</h4> (${group.group_type})
       <dl>
diff --git a/fas/fas/user.py b/fas/fas/user.py
index 516dc20..91fa937 100644
--- a/fas/fas/user.py
+++ b/fas/fas/user.py
@@ -154,7 +154,7 @@ class User(controllers.Controller):
     @identity.require(turbogears.identity.not_anonymous())
     @validate(validators=UserView())
     @error_handler(error)
-    @expose(template="fas.templates.user.view")
+    @expose(template="fas.templates.user.view", allow_json=True)
     def view(self, username=None):
         '''View a User.
         '''
@@ -178,7 +178,10 @@ class User(controllers.Controller):
             cla = 'clicked'
         if signedCLAPrivs(person):
             cla = 'signed'
-        return dict(person=person, groups=groups, cla=cla, personal=personal, admin=admin)
+        person.jsonProps = {
+                'People': ('approved_memberships', 'unapproved_memberships')
+                }
+        return dict(person=person, cla=cla, personal=personal, admin=admin)
 
     @identity.require(turbogears.identity.not_anonymous())
     @validate(validators=UserEdit())