Mercurial > kallithea
changeset 1324:e272be3244f0 beta
fixed regresion made in previos commit, that introduced bug in handling regular repositories
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Thu, 12 May 2011 00:37:40 +0200 |
parents | a7a772ea7b95 |
children | 89ff3e30470f |
files | rhodecode/model/forms.py |
diffstat | 1 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/model/forms.py Thu May 12 00:31:17 2011 +0200 +++ b/rhodecode/model/forms.py Thu May 12 00:37:40 2011 +0200 @@ -217,14 +217,21 @@ e_dict = {'repo_name': _('This repository name is disallowed')} raise formencode.Invalid('', value, state, error_dict=e_dict) - gr = Group.get(value.get('repo_group')) - # value needs to be aware of group name - repo_name_full = gr.full_path + '/' + repo_name + if value.get('repo_group'): + gr = Group.get(value.get('repo_group')) + group_path = gr.full_path + # value needs to be aware of group name + repo_name_full = group_path + '/' + repo_name + else: + group_path = '' + repo_name_full = repo_name + + value['repo_name_full'] = repo_name_full if old_data.get('repo_name') != repo_name_full or not edit: - if gr.full_path != '': + if group_path != '': if RepoModel().get_by_repo_name(repo_name_full,): e_dict = {'repo_name':_('This repository already ' 'exists in group "%s"') % @@ -234,7 +241,8 @@ else: if RepoModel().get_by_repo_name(repo_name_full): - e_dict = {'repo_name':_('This repository already exists')} + e_dict = {'repo_name':_('This repository ' + 'already exists')} raise formencode.Invalid('', value, state, error_dict=e_dict) return value