diff options
author | Marcin Kuzminski <marcin@python-works.com> | 2011-05-12 00:37:40 +0200 |
---|---|---|
committer | Marcin Kuzminski <marcin@python-works.com> | 2011-05-12 00:37:40 +0200 |
commit | 7f33c4f30786c8c8d00d13fb3877f61e23eae032 (patch) | |
tree | 70dc33bff18e39053f1e203b86a6b4cd3de08178 /rhodecode/model/forms.py | |
parent | fff4143372432772e47c2264e2ad1525981f7035 (diff) |
fixed regresion made in previos commit, that introduced bug in handling regular repositories
--HG--
branch : beta
Diffstat (limited to 'rhodecode/model/forms.py')
-rw-r--r-- | rhodecode/model/forms.py | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/rhodecode/model/forms.py b/rhodecode/model/forms.py index 539ce94f..c28f246f 100644 --- a/rhodecode/model/forms.py +++ b/rhodecode/model/forms.py @@ -217,14 +217,21 @@ def ValidRepoName(edit, old_data): 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 @@ def ValidRepoName(edit, old_data): 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 |