Mercurial > kallithea
changeset 3635:be78bf3b1a1f beta
added url quote in clone url. fixes issue #809
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Fri, 29 Mar 2013 23:36:53 +0100 |
| parents | 336184b9f4cf |
| children | ddc4c12f00fb |
| files | rhodecode/controllers/summary.py rhodecode/templates/summary/summary.html |
| diffstat | 2 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/summary.py Fri Mar 29 23:33:02 2013 +0100 +++ b/rhodecode/controllers/summary.py Fri Mar 29 23:36:53 2013 +0100 @@ -37,13 +37,14 @@ from beaker.cache import cache_region, region_invalidate +from rhodecode.lib import helpers as h from rhodecode.lib.compat import product from rhodecode.lib.vcs.exceptions import ChangesetError, EmptyRepositoryError, \ NodeDoesNotExistError from rhodecode.config.conf import ALL_READMES, ALL_EXTS, LANGUAGES_EXTENSIONS_MAP from rhodecode.model.db import Statistics, CacheInvalidation from rhodecode.lib.utils import jsonify -from rhodecode.lib.utils2 import safe_unicode +from rhodecode.lib.utils2 import safe_unicode, safe_str from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator,\ NotAnonymous from rhodecode.lib.base import BaseRepoController, render @@ -101,10 +102,10 @@ 'pass': password, 'scheme': parsed_url.scheme, 'netloc': parsed_url.netloc, - 'path': decoded_path + 'path': urllib.quote(safe_str(decoded_path)) } - uri = uri_tmpl % uri_dict + uri = (uri_tmpl % uri_dict) # generate another clone url by id uri_dict.update( {'path': decoded_path.replace(repo_name, '_%s' % c.dbrepo.repo_id)}
--- a/rhodecode/templates/summary/summary.html Fri Mar 29 23:33:02 2013 +0100 +++ b/rhodecode/templates/summary/summary.html Fri Mar 29 23:36:53 2013 +0100 @@ -116,8 +116,8 @@ <label>${_('Clone url')}:</label> </div> <div class="input ${summary(c.show_stats)}"> - <input style="width:80%" type="text" id="clone_url" readonly="readonly" value="${c.clone_repo_url}"/> - <input style="display:none;width:80%" type="text" id="clone_url_id" readonly="readonly" value="${c.clone_repo_url_id}"/> + <input style="width:${'75%' if c.show_stats else '80%'}" type="text" id="clone_url" readonly="readonly" value="${c.clone_repo_url}"/> + <input style="display:none;width:${'75%' if c.show_stats else '80%'}" type="text" id="clone_url_id" readonly="readonly" value="${c.clone_repo_url_id}"/> <div style="display:none" id="clone_by_name" class="ui-btn clone">${_('Show by Name')}</div> <div id="clone_by_id" class="ui-btn clone">${_('Show by ID')}</div> </div>