Fixed show groups in org personal page bug

organizations/views.py

@@ -16,7 +16,7 @@ from seaserv import ccnet_threaded_rpc, seafserv_threaded_rpc, \
     get_orgs_by_user, get_org_repos, list_org_inner_pub_repos, \
     get_org_by_url_prefix, create_org, get_user_current_org, add_org_user, \
     remove_org_user, get_org_groups, is_valid_filename, \
-    create_org_repo, get_org_id_by_group
+    create_org_repo, get_org_id_by_group, get_org_groups_by_user
 
 from decorators import org_staff_required
 from forms import OrgCreateForm
@@ -98,7 +98,7 @@ def org_personal(request, url_prefix):
     calculate_repo_last_modify(owned_repos)
     owned_repos.sort(lambda x, y: cmp(y.latest_modify, x.latest_modify))
 
-    groups = get_org_groups(org.org_id, 0, MAX_INT)
+    groups = get_org_groups_by_user(org.org_id, user)
     
     return render_to_response('organizations/personal.html', {
             'owned_repos': owned_repos,

thirdpart/seaserv/__init__.py

@@ -7,7 +7,7 @@ from service import get_emailusers
 from service import get_org_groups, get_personal_groups, get_group_repoids, \
     check_group_staff, remove_group_user, get_group, get_org_id_by_group, \
     get_group_members, get_shared_groups_by_repo, is_group_user, \
-    get_org_group_repos, get_group_repos
+    get_org_group_repos, get_group_repos, get_org_groups_by_user
 from service import get_repos, get_repo, get_commits, get_branches, \
     get_org_repos, is_repo_owner, create_org_repo, is_inner_pub_repo, \
     list_org_inner_pub_repos, get_org_id_by_repo_id

thirdpart/seaserv/service.py

@@ -133,6 +133,22 @@ def get_org_groups(org_id, start, limit):
         groups = []
     return groups
 
+def get_org_groups_by_user(org_id, user):
+    """
+    Get user's groups created in org.
+    """
+    try:
+        groups_all = ccnet_threaded_rpc.get_groups(user)
+    except SearpcError:
+        return []
+
+    org_groups = []
+    for group in groups_all:
+        if org_id == ccnet_threaded_rpc.get_org_id_by_group(group.id):
+            org_groups.append(group)
+            
+    return org_groups
+    
 def get_personal_groups(email):
     try:
         groups_all = ccnet_threaded_rpc.get_groups(email)