haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-02 15:38:15 +00:00
Code Issues Releases Wiki Activity

Fix org bug and clean code

Browse Source
This commit is contained in:
xiez
2012-08-02 21:49:17 +08:00
parent 5140af3cb8
commit 574a7a7da8
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
group/views.py
View File

@@ -36,10 +36,6 @@ def group_list(request):
try: try:
group_id = ccnet_threaded_rpc.create_group(group_name.encode('utf-8'), group_id = ccnet_threaded_rpc.create_group(group_name.encode('utf-8'),
request.user.username) request.user.username)
# TODO: transaction?
if request.user.org and group_id > 0:
ccnet_threaded_rpc.add_org_group(request.user.org.org_id,
group_id)
except SearpcError, e: except SearpcError, e:
error_msg = e.msg error_msg = e.msg
return render_error(request, error_msg) return render_error(request, error_msg)

5
organizations/utils.py
View File

@@ -5,10 +5,9 @@ from seaserv import get_org_id_by_repo_id
def access_org_repo(request, repo_id): def access_org_repo(request, repo_id):
""" """
Check whether user can view org repo. Check whether user can view org repo.
Arguments:
- `request`: request must has org dict.
- `repo_id`: repo id
""" """
if not request.user.org:
return False
cur_org_id = request.user.org['org_id'] cur_org_id = request.user.org['org_id']
org_id = get_org_id_by_repo_id(repo_id) org_id = get_org_id_by_repo_id(repo_id)
return True if cur_org_id == org_id else False return True if cur_org_id == org_id else False