rhodecode-enterprise-ce Commit - r1884:311a54f7

routing: fixed pyramid routing generation....

marcink -

r1884:311a54f7 default

parent child

rhodecode/public/js/rhodecode/routes.js

0 +36 -36

		@@ -51,43 +51,43 b' function registerRCRoutes() {'
51	51	pyroutes.register('global_integrations_list', '/_admin/integrations/%(integration)s', ['integration']);
52	52	pyroutes.register('global_integrations_create', '/_admin/integrations/%(integration)s/new', ['integration']);
53	53	pyroutes.register('global_integrations_edit', '/_admin/integrations/%(integration)s/%(integration_id)s', ['integration', 'integration_id']);
54		pyroutes.register('repo_group_integrations_home', '%(repo_group_name)s/settings/integrations', ['repo_group_name']);
55		pyroutes.register('repo_group_integrations_list', '%(repo_group_name)s/settings/integrations/%(integration)s', ['repo_group_name', 'integration']);
56		pyroutes.register('repo_group_integrations_new', '%(repo_group_name)s/settings/integrations/new', ['repo_group_name']);
57		pyroutes.register('repo_group_integrations_create', '%(repo_group_name)s/settings/integrations/%(integration)s/new', ['repo_group_name', 'integration']);
58		pyroutes.register('repo_group_integrations_edit', '%(repo_group_name)s/settings/integrations/%(integration)s/%(integration_id)s', ['repo_group_name', 'integration', 'integration_id']);
59		pyroutes.register('repo_integrations_home', '%(repo_name)s/settings/integrations', ['repo_name']);
60		pyroutes.register('repo_integrations_list', '%(repo_name)s/settings/integrations/%(integration)s', ['repo_name', 'integration']);
61		pyroutes.register('repo_integrations_new', '%(repo_name)s/settings/integrations/new', ['repo_name']);
62		pyroutes.register('repo_integrations_create', '%(repo_name)s/settings/integrations/%(integration)s/new', ['repo_name', 'integration']);
63		pyroutes.register('repo_integrations_edit', '%(repo_name)s/settings/integrations/%(integration)s/%(integration_id)s', ['repo_name', 'integration', 'integration_id']);
64		pyroutes.register('ops_ping', '_admin/ops/ping', []);
	54	pyroutes.register('repo_group_integrations_home', '/%(repo_group_name)s/settings/integrations', ['repo_group_name']);
	55	pyroutes.register('repo_group_integrations_list', '/%(repo_group_name)s/settings/integrations/%(integration)s', ['repo_group_name', 'integration']);
	56	pyroutes.register('repo_group_integrations_new', '/%(repo_group_name)s/settings/integrations/new', ['repo_group_name']);
	57	pyroutes.register('repo_group_integrations_create', '/%(repo_group_name)s/settings/integrations/%(integration)s/new', ['repo_group_name', 'integration']);
	58	pyroutes.register('repo_group_integrations_edit', '/%(repo_group_name)s/settings/integrations/%(integration)s/%(integration_id)s', ['repo_group_name', 'integration', 'integration_id']);
	59	pyroutes.register('repo_integrations_home', '/%(repo_name)s/settings/integrations', ['repo_name']);
	60	pyroutes.register('repo_integrations_list', '/%(repo_name)s/settings/integrations/%(integration)s', ['repo_name', 'integration']);
	61	pyroutes.register('repo_integrations_new', '/%(repo_name)s/settings/integrations/new', ['repo_name']);
	62	pyroutes.register('repo_integrations_create', '/%(repo_name)s/settings/integrations/%(integration)s/new', ['repo_name', 'integration']);
	63	pyroutes.register('repo_integrations_edit', '/%(repo_name)s/settings/integrations/%(integration)s/%(integration_id)s', ['repo_name', 'integration', 'integration_id']);
	64	pyroutes.register('ops_ping', '/_admin/ops/ping', []);
65	65	pyroutes.register('admin_home', '/_admin', []);
66		pyroutes.register('admin_audit_logs', '_admin/audit_logs', []);
67		pyroutes.register('pull_requests_global_0', '_admin/pull_requests/%(pull_request_id)s', ['pull_request_id']);
68		pyroutes.register('pull_requests_global_1', '_admin/pull-requests/%(pull_request_id)s', ['pull_request_id']);
69		pyroutes.register('pull_requests_global', '_admin/pull-request/%(pull_request_id)s', ['pull_request_id']);
70		pyroutes.register('admin_settings_open_source', '_admin/settings/open_source', []);
71		pyroutes.register('admin_settings_vcs_svn_generate_cfg', '_admin/settings/vcs/svn_generate_cfg', []);
72		pyroutes.register('admin_settings_system', '_admin/settings/system', []);
73		pyroutes.register('admin_settings_system_update', '_admin/settings/system/updates', []);
74		pyroutes.register('admin_settings_sessions', '_admin/settings/sessions', []);
75		pyroutes.register('admin_settings_sessions_cleanup', '_admin/settings/sessions/cleanup', []);
76		pyroutes.register('admin_permissions_ips', '_admin/permissions/ips', []);
77		pyroutes.register('users', '_admin/users', []);
78		pyroutes.register('users_data', '_admin/users_data', []);
79		pyroutes.register('edit_user_auth_tokens', '_admin/users/%(user_id)s/edit/auth_tokens', ['user_id']);
80		pyroutes.register('edit_user_auth_tokens_add', '_admin/users/%(user_id)s/edit/auth_tokens/new', ['user_id']);
81		pyroutes.register('edit_user_auth_tokens_delete', '_admin/users/%(user_id)s/edit/auth_tokens/delete', ['user_id']);
82		pyroutes.register('edit_user_emails', '_admin/users/%(user_id)s/edit/emails', ['user_id']);
83		pyroutes.register('edit_user_emails_add', '_admin/users/%(user_id)s/edit/emails/new', ['user_id']);
84		pyroutes.register('edit_user_emails_delete', '_admin/users/%(user_id)s/edit/emails/delete', ['user_id']);
85		pyroutes.register('edit_user_ips', '_admin/users/%(user_id)s/edit/ips', ['user_id']);
86		pyroutes.register('edit_user_ips_add', '_admin/users/%(user_id)s/edit/ips/new', ['user_id']);
87		pyroutes.register('edit_user_ips_delete', '_admin/users/%(user_id)s/edit/ips/delete', ['user_id']);
88		pyroutes.register('edit_user_groups_management', '_admin/users/%(user_id)s/edit/groups_management', ['user_id']);
89		pyroutes.register('edit_user_groups_management_updates', '_admin/users/%(user_id)s/edit/edit_user_groups_management/updates', ['user_id']);
90		pyroutes.register('edit_user_audit_logs', '_admin/users/%(user_id)s/edit/audit', ['user_id']);
	66	pyroutes.register('admin_audit_logs', '/_admin/audit_logs', []);
	67	pyroutes.register('pull_requests_global_0', '/_admin/pull_requests/%(pull_request_id)s', ['pull_request_id']);
	68	pyroutes.register('pull_requests_global_1', '/_admin/pull-requests/%(pull_request_id)s', ['pull_request_id']);
	69	pyroutes.register('pull_requests_global', '/_admin/pull-request/%(pull_request_id)s', ['pull_request_id']);
	70	pyroutes.register('admin_settings_open_source', '/_admin/settings/open_source', []);
	71	pyroutes.register('admin_settings_vcs_svn_generate_cfg', '/_admin/settings/vcs/svn_generate_cfg', []);
	72	pyroutes.register('admin_settings_system', '/_admin/settings/system', []);
	73	pyroutes.register('admin_settings_system_update', '/_admin/settings/system/updates', []);
	74	pyroutes.register('admin_settings_sessions', '/_admin/settings/sessions', []);
	75	pyroutes.register('admin_settings_sessions_cleanup', '/_admin/settings/sessions/cleanup', []);
	76	pyroutes.register('admin_permissions_ips', '/_admin/permissions/ips', []);
	77	pyroutes.register('users', '/_admin/users', []);
	78	pyroutes.register('users_data', '/_admin/users_data', []);
	79	pyroutes.register('edit_user_auth_tokens', '/_admin/users/%(user_id)s/edit/auth_tokens', ['user_id']);
	80	pyroutes.register('edit_user_auth_tokens_add', '/_admin/users/%(user_id)s/edit/auth_tokens/new', ['user_id']);
	81	pyroutes.register('edit_user_auth_tokens_delete', '/_admin/users/%(user_id)s/edit/auth_tokens/delete', ['user_id']);
	82	pyroutes.register('edit_user_emails', '/_admin/users/%(user_id)s/edit/emails', ['user_id']);
	83	pyroutes.register('edit_user_emails_add', '/_admin/users/%(user_id)s/edit/emails/new', ['user_id']);
	84	pyroutes.register('edit_user_emails_delete', '/_admin/users/%(user_id)s/edit/emails/delete', ['user_id']);
	85	pyroutes.register('edit_user_ips', '/_admin/users/%(user_id)s/edit/ips', ['user_id']);
	86	pyroutes.register('edit_user_ips_add', '/_admin/users/%(user_id)s/edit/ips/new', ['user_id']);
	87	pyroutes.register('edit_user_ips_delete', '/_admin/users/%(user_id)s/edit/ips/delete', ['user_id']);
	88	pyroutes.register('edit_user_groups_management', '/_admin/users/%(user_id)s/edit/groups_management', ['user_id']);
	89	pyroutes.register('edit_user_groups_management_updates', '/_admin/users/%(user_id)s/edit/edit_user_groups_management/updates', ['user_id']);
	90	pyroutes.register('edit_user_audit_logs', '/_admin/users/%(user_id)s/edit/audit', ['user_id']);
91	91	pyroutes.register('channelstream_connect', '/_admin/channelstream/connect', []);
92	92	pyroutes.register('channelstream_subscribe', '/_admin/channelstream/subscribe', []);
93	93	pyroutes.register('channelstream_proxy', '/_channelstream', []);

rhodecode/subscribers.py

0 +3 0

                      routepath = _argument_prog.sub(replace, routepath)
+                     if not routepath.startswith('/'):
+                         routepath = '/'+routepath
                      return (
                          route.name,
                          routepath,

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages