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

Merge pull request #3654 from haiwen/fix-restore-repo

Browse Source 
fix restore repo
This commit is contained in:
Daniel Pan
2019-06-14 13:28:57 +08:00
committed by GitHub
parent a6530f48d7 475bb33e47
commit 95aeb7a279
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
seahub/handlers.py
View File

@@ -17,15 +17,16 @@ try:
repo_id = kwargs['repo_id'] repo_id = kwargs['repo_id']
repo_name = kwargs['repo_name'] repo_name = kwargs['repo_name']
# Move here to avoid model import during Django setup. # Move here to avoid model import during Django setup.
# TODO: Don't register signal/hanlders during Seahub start. # TODO: Don't register signal/handlers during Seahub start.
if org_id > 0: if org_id > 0:
related_users = seafile_api.org_get_shared_users_by_repo(org_id, repo_id) related_users = seafile_api.org_get_shared_users_by_repo(org_id, repo_id)
else: else:
related_users = seafile_api.get_shared_users_by_repo(repo_id) related_users = seafile_api.get_shared_users_by_repo(repo_id)
org_id = -1 org_id = -1
if creator not in related_users:
related_users.append(creator) related_users.append(creator)
record = { record = {
@@ -78,6 +79,7 @@ try:
related_users = seafile_api.get_shared_users_by_repo(repo_id) related_users = seafile_api.get_shared_users_by_repo(repo_id)
org_id = -1 org_id = -1
if repo_owner not in related_users:
related_users.append(repo_owner) related_users.append(repo_owner)
record = { record = {
@@ -113,7 +115,9 @@ try:
related_users = seafile_api.get_shared_users_by_repo(repo_id) related_users = seafile_api.get_shared_users_by_repo(repo_id)
org_id = -1 org_id = -1
if repo_owner not in related_users:
related_users.append(repo_owner) related_users.append(repo_owner)
record = { record = {
'op_type':'clean-up-trash', 'op_type':'clean-up-trash',
'obj_type':'repo', 'obj_type':'repo',
@@ -144,6 +148,7 @@ try:
related_users = seafile_api.get_shared_users_by_repo(repo_id) related_users = seafile_api.get_shared_users_by_repo(repo_id)
repo_owner = seafile_api.get_repo_owner(repo_id) repo_owner = seafile_api.get_repo_owner(repo_id)
if repo_owner not in related_users:
related_users.append(repo_owner) related_users.append(repo_owner)
record = { record = {
@@ -154,7 +159,7 @@ try:
'repo_name': repo.repo_name, 'repo_name': repo.repo_name,
'path': '/', 'path': '/',
'op_user': operator, 'op_user': operator,
'related_users': [related_users], 'related_users': related_users,
'org_id': org_id, 'org_id': org_id,
} }