1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-15 23:00:57 +00:00

Removed org

This commit is contained in:
zhengxie
2013-04-02 19:56:44 +08:00
parent 12dae03ad5
commit 355d461521
8 changed files with 46 additions and 102 deletions

View File

@@ -15,39 +15,39 @@ def sys_staff_required(func):
raise Http404
return _decorated
def ctx_switch_required(func):
"""
Decorator for views to change navigation bar automatically that render
same template when both in org context and personal context.
"""
def _decorated(request, *args, **kwargs):
if not request.cloud_mode:
# no need to switch context when `CLOUD_MODE` is false
request.user.org = None
request.base_template = 'myhome_base.html'
return func(request, *args, **kwargs)
# def ctx_switch_required(func):
# """
# Decorator for views to change navigation bar automatically that render
# same template when both in org context and personal context.
# """
# def _decorated(request, *args, **kwargs):
# if not request.cloud_mode:
# # no need to switch context when `CLOUD_MODE` is false
# request.user.org = None
# request.base_template = 'myhome_base.html'
# return func(request, *args, **kwargs)
repo_id = kwargs.get('repo_id', '')
group_id = kwargs.get('group_id', '')
if repo_id and group_id:
return func(request, *args, **kwargs)
if not repo_id and not group_id:
return func(request, *args, **kwargs)
# repo_id = kwargs.get('repo_id', '')
# group_id = kwargs.get('group_id', '')
# if repo_id and group_id:
# return func(request, *args, **kwargs)
# if not repo_id and not group_id:
# return func(request, *args, **kwargs)
user = request.user.username
if repo_id:
org, base_template = check_and_get_org_by_repo(repo_id, user)
# user = request.user.username
# if repo_id:
# org, base_template = check_and_get_org_by_repo(repo_id, user)
if group_id:
org, base_template = check_and_get_org_by_group(int(group_id), user)
# if group_id:
# org, base_template = check_and_get_org_by_group(int(group_id), user)
if org:
request.user.org = org._dict
else:
request.user.org = None
request.base_template = base_template
return func(request, *args, **kwargs)
return _decorated
# if org:
# request.user.org = org._dict
# else:
# request.user.org = None
# request.base_template = base_template
# return func(request, *args, **kwargs)
# return _decorated
def repo_passwd_set_required(func):
"""