Show More
@@ -286,13 +286,18 b' class RepoGroupModel(object):' | |||
|
286 | 286 | repo_group.group_description = repo_group_args['group_description'] |
|
287 | 287 | if 'parent_group_id' in repo_group_args: |
|
288 | 288 | assert repo_group_args['parent_group_id'] != '-1', repo_group_args # RepoGroupForm should have converted to None |
|
289 |
|
|
|
290 |
|
|
|
289 | new_parent_group = db.RepoGroup.get(repo_group_args['parent_group_id']) | |
|
290 | if new_parent_group is not repo_group.parent_group: | |
|
291 | repo_group.parent_group = new_parent_group | |
|
292 | repo_group.group_name = repo_group.get_new_name(repo_group.name) | |
|
293 | log.debug('Moving repo group %s to %s', old_path, repo_group.group_name) | |
|
291 | 294 | if 'group_name' in repo_group_args: |
|
292 | 295 | group_name = repo_group_args['group_name'] |
|
293 | 296 | if kallithea.lib.utils2.repo_name_slug(group_name) != group_name: |
|
294 | 297 | raise Exception('invalid repo group name %s' % group_name) |
|
295 |
|
|
|
298 | if repo_group.name != group_name: | |
|
299 | repo_group.group_name = repo_group.get_new_name(group_name) | |
|
300 | log.debug('Renaming repo group %s to %s', old_path, repo_group.group_name) | |
|
296 | 301 | new_path = repo_group.full_path |
|
297 | 302 | meta.Session().add(repo_group) |
|
298 | 303 | |
@@ -301,6 +306,8 b' class RepoGroupModel(object):' | |||
|
301 | 306 | # full path of the parent. |
|
302 | 307 | # This can potentially be a heavy operation. |
|
303 | 308 | for obj in repo_group.recursive_groups_and_repos(): |
|
309 | if obj is repo_group: | |
|
310 | continue # already updated and logged | |
|
304 | 311 | if isinstance(obj, db.RepoGroup): |
|
305 | 312 | new_name = obj.get_new_name(obj.name) |
|
306 | 313 | log.debug('Fixing repo group %s to new name %s', obj.group_name, new_name) |
General Comments 0
You need to be logged in to leave comments.
Login now