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

Fix bug in render error

Browse Source
This commit is contained in:
xiez
2012-08-31 19:37:22 +08:00
parent 5ad09999c7
commit f26bfb5727
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
group/views.py
View File

@@ -147,10 +147,7 @@ def render_group_info(request, group_id, form):
if group.id == group_id_int: if group.id == group_id_int:
joined = True joined = True
if not joined and not request.user.is_staff: if not joined and not request.user.is_staff:
return render_error(request, u'未加入该小组', extra_ctx={ return render_error(request, u'未加入该小组')
'org': org,
'base_template': base_template,
})
# if request.user.org and not request.user.org.is_staff: # if request.user.org and not request.user.org.is_staff:
# return render_error(request, u'未加入该小组') # return render_error(request, u'未加入该小组')

17
organizations/views.py
View File

@@ -50,7 +50,9 @@ def create_org(request):
return HttpResponseRedirect(\ return HttpResponseRedirect(\
reverse(org_info, args=[url_prefix])) reverse(org_info, args=[url_prefix]))
except SearpcError, e: except SearpcError, e:
return render_error(request, e.msg) return render_error(request, e.msg, extra_ctx={
'base_template': 'myhome_base.html',
})
else: else:
form = OrgCreateForm() form = OrgCreateForm()
@@ -68,10 +70,6 @@ def org_info(request, url_prefix):
if not org: if not org:
return HttpResponseRedirect(reverse(myhome)) return HttpResponseRedirect(reverse(myhome))
# ctx_dict = {'base_template': 'org_base.html',
# 'org_dict': org._dict}
# set_cur_ctx(request, ctx_dict)
org_members = ccnet_threaded_rpc.get_org_emailusers(url_prefix, org_members = ccnet_threaded_rpc.get_org_emailusers(url_prefix,
0, MAX_INT) 0, MAX_INT)
repos = list_org_inner_pub_repos(org.org_id) repos = list_org_inner_pub_repos(org.org_id)
@@ -429,13 +427,18 @@ def org_group_remove(request, url_prefix, group_id):
# Check whether is the org group. # Check whether is the org group.
org_id = get_org_id_by_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, '该小组不属于当前团体',
extra_ctx={'org': request.user.org,
'base_template': 'org_base.html'})
try: try:
ccnet_threaded_rpc.remove_group(group_id_int, request.user.username) ccnet_threaded_rpc.remove_group(group_id_int, request.user.username)
seafserv_threaded_rpc.remove_repo_group(group_id_int, None) seafserv_threaded_rpc.remove_repo_group(group_id_int, None)
ccnet_threaded_rpc.remove_org_group(org_id, group_id_int) ccnet_threaded_rpc.remove_org_group(org_id, group_id_int)
except SearpcError, e: except SearpcError, e:
return render_error(request, e.msg) return render_error(request, e.msg, extra_ctx={
'org': request.user.org,
'base_template': 'org_base.html',
})
return HttpResponseRedirect(next) return HttpResponseRedirect(next)

2
utils.py
View File

@@ -57,7 +57,6 @@ def render_permission_error(request, msg=None, extra_ctx=None):
""" """
ctx = {} ctx = {}
ctx['error_msg'] = msg or u'权限错误' ctx['error_msg'] = msg or u'权限错误'
ctx['base_template'] = 'myhome_base.html'
if extra_ctx: if extra_ctx:
for k in extra_ctx: for k in extra_ctx:
@@ -73,7 +72,6 @@ def render_error(request, msg=None, extra_ctx=None):
""" """
ctx = {} ctx = {}
ctx['error_msg'] = msg or u'内部错误' ctx['error_msg'] = msg or u'内部错误'
ctx['base_template'] = 'myhome_base.html'
if extra_ctx: if extra_ctx:
for k in extra_ctx: for k in extra_ctx: