From ddf67dbb5b29fa6fd0cfff6186134bd10cdb3e06 Mon Sep 17 00:00:00 2001 From: Marcin Kuzminski Date: Fri, 12 May 2017 11:55:07 +0200 Subject: [PATCH] repo-settings: unify the URL schemas and always use settings/ for repo based urls. --- rhodecode/apps/repository/__init__.py | 10 +++++----- rhodecode/public/js/rhodecode/routes.js | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/rhodecode/apps/repository/__init__.py b/rhodecode/apps/repository/__init__.py index a2eb23d4..b33f7faa 100644 --- a/rhodecode/apps/repository/__init__.py +++ b/rhodecode/apps/repository/__init__.py @@ -44,23 +44,23 @@ def includeme(config): # Maintenance config.add_route( name='repo_maintenance', - pattern='/{repo_name:.*?[^/]}/maintenance', repo_route=True) + pattern='/{repo_name:.*?[^/]}/settings/maintenance', repo_route=True) config.add_route( name='repo_maintenance_execute', - pattern='/{repo_name:.*?[^/]}/maintenance/execute', repo_route=True) + pattern='/{repo_name:.*?[^/]}/settings/maintenance/execute', repo_route=True) # Strip config.add_route( name='strip', - pattern='/{repo_name:.*?[^/]}/strip', repo_route=True) + pattern='/{repo_name:.*?[^/]}/settings/strip', repo_route=True) config.add_route( name='strip_check', - pattern='/{repo_name:.*?[^/]}/strip_check', repo_route=True) + pattern='/{repo_name:.*?[^/]}/settings/strip_check', repo_route=True) config.add_route( name='strip_execute', - pattern='/{repo_name:.*?[^/]}/strip_execute', repo_route=True) + pattern='/{repo_name:.*?[^/]}/settings/strip_execute', repo_route=True) # Scan module for configuration decorators. config.scan() diff --git a/rhodecode/public/js/rhodecode/routes.js b/rhodecode/public/js/rhodecode/routes.js index a0506a1a..85266eb3 100644 --- a/rhodecode/public/js/rhodecode/routes.js +++ b/rhodecode/public/js/rhodecode/routes.js @@ -100,11 +100,11 @@ function registerRCRoutes() { pyroutes.register('edit_repo_caches', '/%(repo_name)s/settings/caches', ['repo_name']); pyroutes.register('edit_repo_perms', '/%(repo_name)s/settings/permissions', ['repo_name']); pyroutes.register('repo_reviewers', '/%(repo_name)s/settings/review/rules', ['repo_name']); - pyroutes.register('repo_maintenance', '/%(repo_name)s/maintenance', ['repo_name']); - pyroutes.register('repo_maintenance_execute', '/%(repo_name)s/maintenance/execute', ['repo_name']); - pyroutes.register('strip', '/%(repo_name)s/strip', ['repo_name']); - pyroutes.register('strip_check', '/%(repo_name)s/strip_check', ['repo_name']); - pyroutes.register('strip_execute', '/%(repo_name)s/strip_execute', ['repo_name']); + pyroutes.register('repo_maintenance', '/%(repo_name)s/settings/maintenance', ['repo_name']); + pyroutes.register('repo_maintenance_execute', '/%(repo_name)s/settings/maintenance/execute', ['repo_name']); + pyroutes.register('strip', '/%(repo_name)s/settings/strip', ['repo_name']); + pyroutes.register('strip_check', '/%(repo_name)s/settings/strip_check', ['repo_name']); + pyroutes.register('strip_execute', '/%(repo_name)s/settings/strip_execute', ['repo_name']); pyroutes.register('search', '/_admin/search', []); pyroutes.register('search_repo', '/%(repo_name)s/search', ['repo_name']); pyroutes.register('user_profile', '/_profiles/%(username)s', ['username']);