Mercurial > kallithea
changeset 6317:36e22160e5e5
db: rename RepoGroup.group_parent_id to parent_group_id
Also for consistency with the existing parent_group relationship.
| author | Søren Løvborg <sorenl@unity3d.com> |
|---|---|
| date | Mon, 07 Nov 2016 14:59:39 +0100 |
| parents | bf3546d1cd77 |
| children | 2d216fd7d5a2 |
| files | kallithea/controllers/admin/repo_groups.py kallithea/model/db.py kallithea/model/forms.py kallithea/model/repo_group.py kallithea/model/scm.py kallithea/model/validators.py kallithea/templates/admin/repo_groups/repo_group_add.html kallithea/templates/admin/repo_groups/repo_group_edit_settings.html kallithea/tests/fixture.py kallithea/tests/models/common.py kallithea/tests/models/test_repo_groups.py kallithea/tests/other/test_validators.py |
| diffstat | 12 files changed, 42 insertions(+), 42 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/admin/repo_groups.py Wed Nov 09 14:17:34 2016 +0100 +++ b/kallithea/controllers/admin/repo_groups.py Mon Nov 07 14:59:39 2016 +0100 @@ -162,7 +162,7 @@ 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 @@ 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,
--- a/kallithea/model/db.py Wed Nov 09 14:17:34 2016 +0100 +++ b/kallithea/model/db.py Mon Nov 07 14:59:39 2016 +0100 @@ -1511,7 +1511,7 @@ 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)
--- a/kallithea/model/forms.py Wed Nov 09 14:17:34 2016 +0100 +++ b/kallithea/model/forms.py Mon Nov 07 14:59:39 2016 +0100 @@ -172,7 +172,7 @@ #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),
--- a/kallithea/model/repo_group.py Wed Nov 09 14:17:34 2016 +0100 +++ b/kallithea/model/repo_group.py Mon Nov 07 14:59:39 2016 +0100 @@ -290,10 +290,10 @@ # 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)
--- a/kallithea/model/scm.py Wed Nov 09 14:17:34 2016 +0100 +++ b/kallithea/model/scm.py Mon Nov 07 14:59:39 2016 +0100 @@ -224,7 +224,7 @@ """ 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):
--- a/kallithea/model/validators.py Wed Nov 09 14:17:34 2016 +0100 +++ b/kallithea/model/validators.py Mon Nov 07 14:59:39 2016 +0100 @@ -194,7 +194,7 @@ 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 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 @@ # 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 @@ 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
--- a/kallithea/templates/admin/repo_groups/repo_group_add.html Wed Nov 09 14:17:34 2016 +0100 +++ b/kallithea/templates/admin/repo_groups/repo_group_add.html Mon Nov 07 14:59:39 2016 +0100 @@ -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();
--- a/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html Wed Nov 09 14:17:34 2016 +0100 +++ b/kallithea/templates/admin/repo_groups/repo_group_edit_settings.html Mon Nov 07 14:59:39 2016 +0100 @@ -18,9 +18,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','',c.repo_groups,class_="medium")} + ${h.select('parent_group_id','',c.repo_groups,class_="medium")} </div> </div> @@ -56,7 +56,7 @@ <script> $(document).ready(function(){ - $("#group_parent_id").select2({ + $("#parent_group_id").select2({ 'dropdownAutoWidth': true }); });
--- a/kallithea/tests/fixture.py Wed Nov 09 14:17:34 2016 +0100 +++ b/kallithea/tests/fixture.py Mon Nov 07 14:59:39 2016 +0100 @@ -94,7 +94,7 @@ 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 @@ 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
--- a/kallithea/tests/models/common.py Wed Nov 09 14:17:34 2016 +0100 +++ b/kallithea/tests/models/common.py Mon Nov 07 14:59:39 2016 +0100 @@ -57,15 +57,15 @@ 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)
--- a/kallithea/tests/models/test_repo_groups.py Wed Nov 09 14:17:34 2016 +0100 +++ b/kallithea/tests/models/test_repo_groups.py Mon Nov 07 14:59:39 2016 +0100 @@ -17,7 +17,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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)
--- a/kallithea/tests/other/test_validators.py Wed Nov 09 14:17:34 2016 +0100 +++ b/kallithea/tests/other/test_validators.py Mon Nov 07 14:59:39 2016 +0100 @@ -96,7 +96,7 @@ 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)