haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-19 18:29:23 +00:00
Code Issues Releases Wiki Activity

Modify org

Browse Source
This commit is contained in:
xiez
2012-08-04 11:47:00 +08:00
parent a3029a9b99
commit f35a04da14
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
organizations/views.py
View File

@@ -16,7 +16,7 @@ from seaserv import ccnet_threaded_rpc, seafserv_threaded_rpc, \
get_orgs_by_user, get_org_repos, \ get_orgs_by_user, get_org_repos, \
get_org_by_url_prefix, create_org, get_user_current_org, add_org_user, \ 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, \ 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 decorators import org_staff_required
from forms import OrgCreateForm from forms import OrgCreateForm
@@ -360,7 +360,7 @@ def org_group_remove(request, url_prefix, group_id):
return HttpResponseRedirect(next) return HttpResponseRedirect(next)
# Check whether is the org group. # 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: if request.user.org['org_id'] != org_id:
return render_permission_error(request, '该小组不属于当前团体') return render_permission_error(request, '该小组不属于当前团体')

2
thirdpart/seaserv/__init__.py
View File

@@ -5,7 +5,7 @@ from service import ccnet_rpc, monitor_rpc, seafserv_rpc, \
from service import send_command from service import send_command
from service import get_ccnetuser, get_emailusers from service import get_ccnetuser, get_emailusers
from service import get_org_groups, get_personal_groups, get_group_repoids, \ 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, \ from service import get_repos, get_repo, get_commits, get_branches, \
get_org_repos, is_repo_owner, create_org_repo get_org_repos, is_repo_owner, create_org_repo
from service import get_binding_peerids, is_valid_filename from service import get_binding_peerids, is_valid_filename

11
thirdpart/seaserv/service.py
View File

@@ -169,16 +169,11 @@ def get_personal_groups(email):
return personal_groups return personal_groups
def is_org_group(group_id): def get_org_id_by_group(group_id):
"""
If a group is org group, returns org id which is > 0.
Arguments:
- `group_id`:
"""
try: 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: except SearpcError:
org_id = 0 org_id = -1
return org_id return org_id
def create_org(org_name, url_prefix, username): def create_org(org_name, url_prefix, username):