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

Fixed events link bug

Browse Source
This commit is contained in:
dev
2013-06-22 11:11:06 +08:00
parent aa4e334a12
commit e7377119db
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
seahub/utils/__init__.py
View File

@@ -866,10 +866,10 @@ def convert_cmmt_desc_link(commit):
url = reverse('convert_cmmt_desc_link')
tmp_str = '%s "<a href="%s?repo_id=%s&cmmt_id=%s&nm=%s">%s</a>"'
if remaining:
return (tmp_str + ' %s') % (op, url, repo_id, cmmt_id, file_or_dir,
return (tmp_str + ' %s') % (op, url, repo_id, cmmt_id, urlquote(file_or_dir),
file_or_dir, remaining)
else:
return tmp_str % (op, url, repo_id, cmmt_id, file_or_dir, file_or_dir)
return tmp_str % (op, url, repo_id, cmmt_id, urlquote(file_or_dir), file_or_dir)
return re.sub(CMMT_DESC_PATT, link_repl, commit.desc)

7
seahub/views/__init__.py
View File

@@ -27,6 +27,7 @@ from django.template.loader import render_to_string
from django.utils.hashcompat import md5_constructor
from django.utils.translation import ugettext as _
from django.utils import timezone
from django.utils.http import urlquote
from seahub.auth.decorators import login_required
from seahub.auth import login as auth_login
@@ -2393,13 +2394,13 @@ def convert_cmmt_desc_link(request):
if d.status == 'add' or d.status == 'mod': # Add or modify file
return HttpResponseRedirect(reverse('repo_view_file', args=[repo_id]) + \
'?p=/%s' % d.name)
'?p=/%s' % urlquote(d.name))
elif d.status == 'mov': # Move or Rename file
return HttpResponseRedirect(reverse('repo_view_file', args=[repo_id]) + \
'?p=/%s' % d.new_name)
'?p=/%s' % urlquote(d.new_name))
elif d.status == 'newdir':
return HttpResponseRedirect(reverse('repo', args=[repo_id]) + \
'?p=/%s' % d.name)
'?p=/%s' % urlquote(d.name))
else:
continue