kallithea Changeset - 344ddfeecce2

Changeset - 344ddfeecce2

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 14 years ago 2011-11-27 00:03:12
marcin@python-works.com

small fixes for detection of groups that already exists

1 file changed with 6 insertions and 4 deletions:

rhodecode/model/forms.py

0 comments (0 inline, 0 general)

rhodecode/model/forms.py

➞

Show inline comments

@@ @@ -122,13 +122,15 @@ def ValidReposGroup(edit, old_data): @@
         def validate_python(self, value, state):
             #TODO WRITE VALIDATIONS
             group_name = value.get('group_name')
-            group_parent_id = int(value.get('group_parent_id') or -1)
             group_parent_id = value.get('group_parent_id')
             # slugify repo group just in case :)
             slug = repo_name_slug(group_name)
             # check for parent of self
             if edit and old_data['group_id'] == group_parent_id:
             parent_of_self = lambda:(old_data['group_id'] == int(group_parent_id)
                                      if group_parent_id else False)
             if edit and parent_of_self():
                     e_dict = {'group_parent_id':_('Cannot assign this group '
                                                   'as parent')}
                     raise formencode.Invalid('', value, state,
@@ @@ -136,10 +138,10 @@ def ValidReposGroup(edit, old_data): @@
             old_gname = None
             if edit:
                 old_gname = RepoGroup.get(
                             old_data.get('group_id')).group_name
                 old_gname = RepoGroup.get(old_data.get('group_id')).group_name
             if old_gname != group_name or not edit:
                 # check filesystem
                 gr = RepoGroup.query().filter(RepoGroup.group_name == slug)\
                     .filter(RepoGroup.group_parent_id == group_parent_id).scalar()

0 comments (0 inline, 0 general)