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

Fixed bug in moving files under org context

Browse Source
This commit is contained in:
ZhengXie
2012-09-29 16:51:36 +08:00
parent 75ac577fea
commit 4ca3810790
4 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
utils.py
View File

@@ -16,7 +16,9 @@ from pysearpc import SearpcError
from seaserv import seafserv_rpc, ccnet_threaded_rpc, seafserv_threaded_rpc, \
get_repo, get_commits, get_group_repoids, CCNET_SERVER_ADDR, \
CCNET_SERVER_PORT, get_org_id_by_repo_id, get_org_by_id, is_org_staff, \
get_org_id_by_group
get_org_id_by_group, list_personal_shared_repos, \
get_personal_groups_by_user, list_personal_repos_by_owner, \
list_org_repos_by_owner, get_org_groups_by_user
try:
from settings import DOCUMENT_CONVERTOR_ROOT
except ImportError:
@@ -188,30 +190,30 @@ def get_accessible_repos(request, repo):
for dirent in dirs:
if stat.S_ISDIR(dirent.props.mode):
return True
return False
if repo.encrypted:
repo.has_subdir = check_has_subdir(repo)
accessible_repos = [repo]
return accessible_repos
accessible_repos = []
email = request.user.username
owned_repos = seafserv_threaded_rpc.list_owned_repos(email)
shared_repos = seafserv_threaded_rpc.list_share_repos(email, 'to_email', -1, -1)
groups_repos = []
groups = ccnet_threaded_rpc.get_groups(email)
for group in groups:
group_repo_ids = get_group_repoids(group.id)
for repo_id in group_repo_ids:
if not repo_id:
continue
group_repo = get_repo(repo_id)
if not group_repo:
continue
group_repo.share_from = seafserv_threaded_rpc.get_group_repo_owner(repo_id)
if email != group_repo.share_from:
groups_repos.append(group_repo)
if request.user.org:
# org context
org_id = request.user.org['org_id']
owned_repos = list_org_repos_by_owner(org_id, email)
shared_repos = list_personal_shared_repos(email, 'to_email', -1, -1)
groups_repos = []
for group in get_org_groups_by_user(org_id, email):
groups_repos.append(get_org_group_repos(org_id, group.id, email))
else:
# personal context
owned_repos = list_personal_repos_by_owner(email)
shared_repos = list_personal_shared_repos(email, 'to_email', -1, -1)
groups_repos = []
for group in get_personal_groups_by_user(email):
groups_repos.append(get_group_repos(group.id, email))
def has_repo(repos, repo):
for r in repos:
@@ -219,11 +221,11 @@ def get_accessible_repos(request, repo):
return True
return False
accessible_repos = set()
for repo in owned_repos + shared_repos + groups_repos:
if not has_repo(accessible_repos, repo):
if not repo.props.encrypted:
accessible_repos.append(repo)
repo.props.has_subdir = check_has_subdir(repo)
if not repo.props.encrypted:
repo.has_subdir = check_has_subdir(repo)
accessible_repos.add(repo)
return accessible_repos