diff --git a/organizations/views.py b/organizations/views.py index 4571c261e8..64168cd1a9 100644 --- a/organizations/views.py +++ b/organizations/views.py @@ -16,7 +16,7 @@ from seaserv import ccnet_threaded_rpc, seafserv_threaded_rpc, \ get_orgs_by_user, get_org_repos, \ get_org_by_url_prefix, create_org, get_user_current_org, add_org_user, \ get_ccnetuser, remove_org_user, get_org_groups, is_valid_filename, \ - create_org_repo, is_org_group + create_org_repo, get_org_id_by_group from decorators import org_staff_required from forms import OrgCreateForm @@ -360,7 +360,7 @@ def org_group_remove(request, url_prefix, group_id): return HttpResponseRedirect(next) # Check whether is the org group. - org_id = is_org_group(group_id_int) + org_id = get_org_id_by_group(group_id_int) if request.user.org['org_id'] != org_id: return render_permission_error(request, '该小组不属于当前团体') diff --git a/thirdpart/seaserv/__init__.py b/thirdpart/seaserv/__init__.py index b09e4a56b1..ff0ea2e851 100644 --- a/thirdpart/seaserv/__init__.py +++ b/thirdpart/seaserv/__init__.py @@ -5,7 +5,7 @@ from service import ccnet_rpc, monitor_rpc, seafserv_rpc, \ from service import send_command from service import get_ccnetuser, get_emailusers from service import get_org_groups, get_personal_groups, get_group_repoids, \ - check_group_staff, remove_group_user, get_group, is_org_group + check_group_staff, remove_group_user, get_group, get_org_id_by_group from service import get_repos, get_repo, get_commits, get_branches, \ get_org_repos, is_repo_owner, create_org_repo from service import get_binding_peerids, is_valid_filename diff --git a/thirdpart/seaserv/service.py b/thirdpart/seaserv/service.py index 2a272d7280..b9f8c6592f 100644 --- a/thirdpart/seaserv/service.py +++ b/thirdpart/seaserv/service.py @@ -169,16 +169,11 @@ def get_personal_groups(email): return personal_groups -def is_org_group(group_id): - """ - If a group is org group, returns org id which is > 0. - Arguments: - - `group_id`: - """ +def get_org_id_by_group(group_id): try: - org_id = ccnet_threaded_rpc.is_org_group(group_id) + org_id = ccnet_threaded_rpc.get_org_id_by_group(group_id) except SearpcError: - org_id = 0 + org_id = -1 return org_id def create_org(org_name, url_prefix, username):