engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(branch removal trough UI): changed route path. Fixes: RCCE-75

Browse source
This commit is contained in:
Serhii Ilin 2024-06-14 13:10:47 +03:00
parent c2075c1239
commit 9db393bf1a
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rhodecode/apps/repository/__init__.py
View file

@ -593,7 +593,7 @@ def includeme(config):
config.add_route(
name='branch_remove',
pattern='/{repo_name:.*?[^/]}/{branch_name:.*?[^/]}/remove', repo_route=True, repo_accepted_types=['hg', 'git'])
pattern='/{repo_name:.*?[^/]}/branches/{branch_name:.*?[^/]}/remove', repo_route=True, repo_accepted_types=['hg', 'git'])
config.add_view(
RepoBranchesView,
attr='remove_branch',

2
rhodecode/public/js/rhodecode/routes.js
View file

@ -92,7 +92,7 @@ function registerRCRoutes() {
pyroutes.register('auth_home', '/_admin/auth*traverse', []);
pyroutes.register('bookmarks_home', '/%(repo_name)s/bookmarks', ['repo_name']);
pyroutes.register('branches_home', '/%(repo_name)s/branches', ['repo_name']);
pyroutes.register('branch_remove', '/%(repo_name)s/%(branch_name)s/remove', ['repo_name', 'branch_name']);
pyroutes.register('branch_remove', '/%(repo_name)s/branches/%(branch_name)s/remove', ['repo_name', 'branch_name']);
pyroutes.register('channelstream_connect', '/_admin/channelstream/connect', []);
pyroutes.register('channelstream_proxy', '/_channelstream', []);
pyroutes.register('channelstream_subscribe', '/_admin/channelstream/subscribe', []);

2
rhodecode/tests/routes.py
View file

@ -252,7 +252,7 @@ def get_url_defs():
"pullrequest_show_all_data": "/{repo_name}/pull-request-data",
"bookmarks_home": "/{repo_name}/bookmarks",
"branches_home": "/{repo_name}/branches",
"branch_remove": "/{repo_name}/{branch_name}/remove",
"branch_remove": "/{repo_name}/branches/{branch_name}/remove",
"tags_home": "/{repo_name}/tags",
"repo_changelog": "/{repo_name}/changelog",
"repo_commits": "/{repo_name}/commits",