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

Merge branch '4.4' into 5.0

Browse Source 
Conflicts:
	media/css/seahub.css
	seahub/group/templates/group/group_manage.html
	seahub/utils/__init__.py
	seahub/views/repo.py
	tests/seahub/views/test_file.py
This commit is contained in:
zhengxie
2015-12-02 17:37:50 +08:00
parent 70429bafe4 99fbdab5fd
commit 9d53430e4c
29 changed files with 838 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
seahub/views/sysadmin.py
View File

@@ -1986,10 +1986,15 @@ def sys_virus_scan_records(request):
records = []
for r in records_all[:per_page]:
try:
r.repo = seafile_api.get_repo(r.repo_id)
except SearpcError:
repo = seafile_api.get_repo(r.repo_id)
except SearpcError as e:
logger.error(e)
continue
if not repo:
continue
r.repo = repo
r.repo.owner = seafile_api.get_repo_owner(r.repo.repo_id)
records.append(r)