# HG changeset patch
# User Søren Løvborg <sorenl@unity3d.com>
# Date 2016-11-07 14:59:39
# Node ID 36e22160e5e59a63810928116447a9a458df7afc
# Parent  bf3546d1cd7738bee32514c0d2e241be92fda6ca

db: rename RepoGroup.group_parent_id to parent_group_id

Also for consistency with the existing parent_group relationship.

diff --git a/kallithea/controllers/admin/repo_groups.py b/kallithea/controllers/admin/repo_groups.py
--- a/kallithea/controllers/admin/repo_groups.py
+++ b/kallithea/controllers/admin/repo_groups.py
@@ -162,7 +162,7 @@ class RepoGroupsController(BaseControlle
             gr = RepoGroupModel().create(
                 group_name=form_result['group_name'],
                 group_description=form_result['group_description'],
-                parent=form_result['group_parent_id'],
+                parent=form_result['parent_group_id'],
                 owner=self.authuser.user_id, # TODO: make editable
                 copy_permissions=form_result['group_copy_permissions']
             )
@@ -180,7 +180,7 @@ class RepoGroupsController(BaseControlle
             log.error(traceback.format_exc())
             h.flash(_('Error occurred during creation of repository group %s') \
                     % request.POST.get('group_name'), category='error')
-            parent_group_id = form_result['group_parent_id']
+            parent_group_id = form_result['parent_group_id']
             #TODO: maybe we should get back to the main view, not the admin one
             raise HTTPFound(location=url('repos_groups', parent_group=parent_group_id))
         h.flash(_('Created repository group %s') % gr.group_name,
diff --git a/kallithea/model/db.py b/kallithea/model/db.py
--- a/kallithea/model/db.py
+++ b/kallithea/model/db.py
@@ -1511,7 +1511,7 @@ class RepoGroup(Base, BaseDbModel):
 
     group_id = Column(Integer(), primary_key=True)
     group_name = Column(Unicode(255), nullable=False, unique=True) # full path
-    group_parent_id = Column(Integer(), ForeignKey('groups.group_id'), nullable=True)
+    parent_group_id = Column('group_parent_id', Integer(), ForeignKey('groups.group_id'), nullable=True)
     group_description = Column(Unicode(10000), nullable=False)
     enable_locking = Column(Boolean(), nullable=False, default=False)
     owner_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False)
diff --git a/kallithea/model/forms.py b/kallithea/model/forms.py
--- a/kallithea/model/forms.py
+++ b/kallithea/model/forms.py
@@ -172,7 +172,7 @@ def RepoGroupForm(edit=False, old_data=N
             #its children
             pass
 
-        group_parent_id = All(v.CanCreateGroup(can_create_in_root),
+        parent_group_id = All(v.CanCreateGroup(can_create_in_root),
                               v.OneOf(repo_group_ids, hideList=False,
                                       testValueList=True,
                                       if_missing=None, not_empty=True),
diff --git a/kallithea/model/repo_group.py b/kallithea/model/repo_group.py
--- a/kallithea/model/repo_group.py
+++ b/kallithea/model/repo_group.py
@@ -290,10 +290,10 @@ class RepoGroupModel(BaseModel):
 
             # change properties
             repo_group.group_description = form_data['group_description']
-            repo_group.group_parent_id = form_data['group_parent_id']
+            repo_group.parent_group_id = form_data['parent_group_id']
             repo_group.enable_locking = form_data['enable_locking']
 
-            repo_group.parent_group = RepoGroup.get(form_data['group_parent_id'])
+            repo_group.parent_group = RepoGroup.get(form_data['parent_group_id'])
             repo_group.group_name = repo_group.get_new_name(form_data['group_name'])
             new_path = repo_group.full_path
             self.sa.add(repo_group)
diff --git a/kallithea/model/scm.py b/kallithea/model/scm.py
--- a/kallithea/model/scm.py
+++ b/kallithea/model/scm.py
@@ -224,7 +224,7 @@ class ScmModel(BaseModel):
         """
         if groups is None:
             groups = RepoGroup.query() \
-                .filter(RepoGroup.group_parent_id == None).all()
+                .filter(RepoGroup.parent_group_id == None).all()
         return RepoGroupList(groups)
 
     def mark_for_invalidation(self, repo_name):
diff --git a/kallithea/model/validators.py b/kallithea/model/validators.py
--- a/kallithea/model/validators.py
+++ b/kallithea/model/validators.py
@@ -194,7 +194,7 @@ def ValidRepoGroup(edit=False, old_data=
 
     class _validator(formencode.validators.FancyValidator):
         messages = {
-            'group_parent_id': _('Cannot assign this group as parent'),
+            'parent_group_id': _('Cannot assign this group as parent'),
             'group_exists': _('Group "%(group_name)s" already exists'),
             'repo_exists':
                 _('Repository with name "%(group_name)s" already exists')
@@ -203,20 +203,20 @@ def ValidRepoGroup(edit=False, old_data=
         def validate_python(self, value, state):
             # TODO WRITE VALIDATIONS
             group_name = value.get('group_name')
-            group_parent_id = value.get('group_parent_id')
+            parent_group_id = value.get('parent_group_id')
 
             # slugify repo group just in case :)
             slug = repo_name_slug(group_name)
 
             # check for parent of self
             parent_of_self = lambda: (
-                old_data['group_id'] == group_parent_id
-                if group_parent_id else False
+                old_data['group_id'] == parent_group_id
+                if parent_group_id else False
             )
             if edit and parent_of_self():
-                msg = M(self, 'group_parent_id', state)
+                msg = M(self, 'parent_group_id', state)
                 raise formencode.Invalid(msg, value, state,
-                    error_dict=dict(group_parent_id=msg)
+                    error_dict=dict(parent_group_id=msg)
                 )
 
             old_gname = None
@@ -228,7 +228,7 @@ def ValidRepoGroup(edit=False, old_data=
                 # check group
                 gr = RepoGroup.query() \
                       .filter(RepoGroup.group_name == slug) \
-                      .filter(RepoGroup.group_parent_id == group_parent_id) \
+                      .filter(RepoGroup.parent_group_id == parent_group_id) \
                       .scalar()
 
                 if gr is not None:
@@ -584,7 +584,7 @@ def CanCreateGroup(can_create_in_root=Fa
             if forbidden_in_root or forbidden:
                 msg = M(self, 'permission_denied', state)
                 raise formencode.Invalid(msg, value, state,
-                    error_dict=dict(group_parent_id=msg)
+                    error_dict=dict(parent_group_id=msg)
                 )
 
     return _validator
diff --git a/kallithea/templates/admin/repo_groups/repo_group_add.html b/kallithea/templates/admin/repo_groups/repo_group_add.html
--- a/kallithea/templates/admin/repo_groups/repo_group_add.html
+++ b/kallithea/templates/admin/repo_groups/repo_group_add.html
@@ -43,9 +43,9 @@
             </div>
 
             <div class="form-group">
-                <label class="control-label" for="group_parent_id">${_('Group parent')}:</label>
+                <label class="control-label" for="parent_group_id">${_('Group parent')}:</label>
                 <div class="input">
-                    ${h.select('group_parent_id',request.GET.get('parent_group'),c.repo_groups,class_="medium")}
+                    ${h.select('parent_group_id',request.GET.get('parent_group'),c.repo_groups,class_="medium")}
                 </div>
             </div>
 
@@ -76,11 +76,11 @@
                 $('#copy_perms').hide();
             }
         }
-        $("#group_parent_id").select2({
+        $("#parent_group_id").select2({
             'dropdownAutoWidth': true
         });
-        setCopyPermsOption($('#group_parent_id').val());
-        $("#group_parent_id").on("change", function(e) {
+        setCopyPermsOption($('#parent_group_id').val());
+        $("#parent_group_id").on("change", function(e) {
             setCopyPermsOption(e.val);
         });
         $('#group_name').focus();
diff --git a/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html b/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html
--- a/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html
+++ b/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html
@@ -18,9 +18,9 @@ ${h.form(url('update_repos_group',group_
         </div>
 
         <div class="form-group">
-            <label class="control-label" for="group_parent_id">${_('Group parent')}:</label>
+            <label class="control-label" for="parent_group_id">${_('Group parent')}:</label>
             <div class="input">
-                ${h.select('group_parent_id','',c.repo_groups,class_="medium")}
+                ${h.select('parent_group_id','',c.repo_groups,class_="medium")}
             </div>
         </div>
 
@@ -56,7 +56,7 @@ ${h.end_form()}
 
 <script>
     $(document).ready(function(){
-        $("#group_parent_id").select2({
+        $("#parent_group_id").select2({
             'dropdownAutoWidth': true
         });
     });
diff --git a/kallithea/tests/fixture.py b/kallithea/tests/fixture.py
--- a/kallithea/tests/fixture.py
+++ b/kallithea/tests/fixture.py
@@ -94,7 +94,7 @@ class Fixture(object):
         defs = dict(
             group_name=None,
             group_description=u'DESC',
-            group_parent_id=None,
+            parent_group_id=None,
             perms_updates=[],
             perms_new=[],
             enable_locking=False,
@@ -185,7 +185,7 @@ class Fixture(object):
         gr = RepoGroupModel().create(
             group_name=form_data['group_name'],
             group_description=form_data['group_name'],
-            owner=owner, parent=form_data['group_parent_id'])
+            owner=owner, parent=form_data['parent_group_id'])
         Session().commit()
         gr = RepoGroup.get_by_group_name(gr.group_name)
         return gr
diff --git a/kallithea/tests/models/common.py b/kallithea/tests/models/common.py
--- a/kallithea/tests/models/common.py
+++ b/kallithea/tests/models/common.py
@@ -57,15 +57,15 @@ def _create_project_tree():
         email=u'test_u1@example.com', firstname=u'test_u1', lastname=u'test_u1'
     )
     g0 = fixture.create_repo_group(u'g0')
-    g0_1 = fixture.create_repo_group(u'g0_1', group_parent_id=g0)
-    g0_1_1 = fixture.create_repo_group(u'g0_1_1', group_parent_id=g0_1)
+    g0_1 = fixture.create_repo_group(u'g0_1', parent_group_id=g0)
+    g0_1_1 = fixture.create_repo_group(u'g0_1_1', parent_group_id=g0_1)
     g0_1_1_r1 = fixture.create_repo(u'g0/g0_1/g0_1_1/g0_1_1_r1', repo_group=g0_1_1)
     g0_1_1_r2 = fixture.create_repo(u'g0/g0_1/g0_1_1/g0_1_1_r2', repo_group=g0_1_1)
     g0_1_r1 = fixture.create_repo(u'g0/g0_1/g0_1_r1', repo_group=g0_1)
-    g0_2 = fixture.create_repo_group(u'g0_2', group_parent_id=g0)
+    g0_2 = fixture.create_repo_group(u'g0_2', parent_group_id=g0)
     g0_2_r1 = fixture.create_repo(u'g0/g0_2/g0_2_r1', repo_group=g0_2)
     g0_2_r2 = fixture.create_repo(u'g0/g0_2/g0_2_r2', repo_group=g0_2)
-    g0_3 = fixture.create_repo_group(u'g0_3', group_parent_id=g0)
+    g0_3 = fixture.create_repo_group(u'g0_3', parent_group_id=g0)
     g0_3_r1 = fixture.create_repo(u'g0/g0_3/g0_3_r1', repo_group=g0_3)
     g0_3_r2_private = fixture.create_repo(u'g0/g0_3/g0_3_r1_private',
                                           repo_group=g0_3, repo_private=True)
diff --git a/kallithea/tests/models/test_repo_groups.py b/kallithea/tests/models/test_repo_groups.py
--- a/kallithea/tests/models/test_repo_groups.py
+++ b/kallithea/tests/models/test_repo_groups.py
@@ -17,7 +17,7 @@ fixture = Fixture()
 def _update_group(id_, group_name, desc=u'desc', parent_id=None):
     form_data = fixture._get_group_create_params(group_name=group_name,
                                                  group_desc=desc,
-                                                 group_parent_id=parent_id)
+                                                 parent_group_id=parent_id)
     gr = RepoGroupModel().update(id_, form_data)
     return gr
 
@@ -71,12 +71,12 @@ class TestRepoGroups(TestController):
         Session().rollback()
 
     def test_same_subgroup(self):
-        sg1 = fixture.create_repo_group(u'sub1', group_parent_id=self.g1.group_id)
+        sg1 = fixture.create_repo_group(u'sub1', parent_group_id=self.g1.group_id)
         assert sg1.parent_group == self.g1
         assert sg1.full_path == 'test1/sub1'
         assert self.__check_path('test1', 'sub1')
 
-        ssg1 = fixture.create_repo_group(u'subsub1', group_parent_id=sg1.group_id)
+        ssg1 = fixture.create_repo_group(u'subsub1', parent_group_id=sg1.group_id)
         assert ssg1.parent_group == sg1
         assert ssg1.full_path == 'test1/sub1/subsub1'
         assert self.__check_path('test1', 'sub1', 'subsub1')
@@ -88,7 +88,7 @@ class TestRepoGroups(TestController):
         assert RepoGroup.get(sg1.group_id) == None
         assert not self.__check_path('deteteme')
 
-        sg1 = fixture.create_repo_group(u'deleteme', group_parent_id=self.g1.group_id)
+        sg1 = fixture.create_repo_group(u'deleteme', parent_group_id=self.g1.group_id)
         self.__delete_group(sg1.group_id)
 
         assert RepoGroup.get(sg1.group_id) == None
@@ -103,7 +103,7 @@ class TestRepoGroups(TestController):
 
     def test_update_group_parent(self):
 
-        sg1 = fixture.create_repo_group(u'initial', group_parent_id=self.g1.group_id)
+        sg1 = fixture.create_repo_group(u'initial', parent_group_id=self.g1.group_id)
 
         new_sg1 = _update_group(sg1.group_id, u'after', parent_id=self.g1.group_id)
         assert self.__check_path('test1', 'after')
@@ -140,7 +140,7 @@ class TestRepoGroups(TestController):
 
     def test_move_to_root(self):
         g1 = fixture.create_repo_group(u't11')
-        g2 = fixture.create_repo_group(u't22', group_parent_id=g1.group_id)
+        g2 = fixture.create_repo_group(u't22', parent_group_id=g1.group_id)
 
         assert g2.full_path == 't11/t22'
         assert self.__check_path('t11', 't22')
@@ -156,8 +156,8 @@ class TestRepoGroups(TestController):
 
     def test_rename_top_level_group_in_nested_setup(self):
         g1 = fixture.create_repo_group(u'L1')
-        g2 = fixture.create_repo_group(u'L2', group_parent_id=g1.group_id)
-        g3 = fixture.create_repo_group(u'L3', group_parent_id=g2.group_id)
+        g2 = fixture.create_repo_group(u'L2', parent_group_id=g1.group_id)
+        g3 = fixture.create_repo_group(u'L3', parent_group_id=g2.group_id)
 
         r = fixture.create_repo(u'L1/L2/L3/L3_REPO', repo_group=g3.group_id)
 
@@ -171,8 +171,8 @@ class TestRepoGroups(TestController):
 
     def test_change_parent_of_top_level_group_in_nested_setup(self):
         g1 = fixture.create_repo_group(u'R1')
-        g2 = fixture.create_repo_group(u'R2', group_parent_id=g1.group_id)
-        g3 = fixture.create_repo_group(u'R3', group_parent_id=g2.group_id)
+        g2 = fixture.create_repo_group(u'R2', parent_group_id=g1.group_id)
+        g3 = fixture.create_repo_group(u'R3', parent_group_id=g2.group_id)
         g4 = fixture.create_repo_group(u'R1_NEW')
 
         r = fixture.create_repo(u'R1/R2/R3/R3_REPO', repo_group=g3.group_id)
@@ -186,8 +186,8 @@ class TestRepoGroups(TestController):
 
     def test_change_parent_of_top_level_group_in_nested_setup_with_rename(self):
         g1 = fixture.create_repo_group(u'X1')
-        g2 = fixture.create_repo_group(u'X2', group_parent_id=g1.group_id)
-        g3 = fixture.create_repo_group(u'X3', group_parent_id=g2.group_id)
+        g2 = fixture.create_repo_group(u'X2', parent_group_id=g1.group_id)
+        g3 = fixture.create_repo_group(u'X3', parent_group_id=g2.group_id)
         g4 = fixture.create_repo_group(u'X1_NEW')
 
         r = fixture.create_repo(u'X1/X2/X3/X3_REPO', repo_group=g3.group_id)
diff --git a/kallithea/tests/other/test_validators.py b/kallithea/tests/other/test_validators.py
--- a/kallithea/tests/other/test_validators.py
+++ b/kallithea/tests/other/test_validators.py
@@ -96,7 +96,7 @@ class TestRepoGroups(TestController):
         with pytest.raises(formencode.Invalid):
             validator.to_python({
                                         'group_name': gr.group_name + 'n',
-                                        'group_parent_id': gr.group_id
+                                        'parent_group_id': gr.group_id
                                         })
         model.delete(gr)