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

Fixed rpc return value bug

Browse Source
This commit is contained in:
zhengxie
2013-02-28 19:58:02 +08:00
parent cd1408fb6b
commit f108c3b79a
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
views.py
View File

@@ -894,7 +894,8 @@ def repo_history_changes(request, repo_id):
changes['cmt_desc'] = repo.desc
elif c.second_parent_id is None:
# Normal commit only has one parent.
changes['cmt_desc'] = c.desc
if c.desc.startswith('Changed library'):
changes['cmt_desc'] = _('Changed library name or description')
else:
# A commit is a merge only if it has two parents.
changes['cmt_desc'] = _('No conflict in the merge.')