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

Merge branch '1.1.0-fix'

Browse Source
This commit is contained in:
zhengxie
2012-11-05 12:03:30 +08:00
parent 893f2fffcf c916aa4266
commit 9ee9028d37
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
utils.py
View File

@@ -380,8 +380,17 @@ def get_file_contributors(repo_id, file_path, file_path_hash, file_id):
last_modified = 0 last_modified = 0
last_commit_id = '' last_commit_id = ''
try: try:
fc = FileContributors.objects.get(repo_id=repo_id, # HACK: Fixed the unique key bug in 1.1
file_path_hash=file_path_hash) # Should be removed in future
fc = FileContributors.objects.filter(repo_id=repo_id,
file_path_hash=file_path_hash)
if not fc:
raise FileContributors.DoesNotExist
else:
if len(fc) > 1:
for e in fc[1:]:
e.delete()
fc = fc[0]
except FileContributors.DoesNotExist: except FileContributors.DoesNotExist:
# has no cache yet # has no cache yet
contributors, last_modified, last_commit_id = get_file_contributors_from_revisions (repo_id, file_path) contributors, last_modified, last_commit_id = get_file_contributors_from_revisions (repo_id, file_path)