diff --git a/rhodecode/config/routing.py b/rhodecode/config/routing.py --- a/rhodecode/config/routing.py +++ b/rhodecode/config/routing.py @@ -9,12 +9,13 @@ from __future__ import with_statement from routes import Mapper from rhodecode.lib.utils import check_repo_fast as cr + def make_map(config): """Create, configure and return the routes Mapper""" - map = Mapper(directory=config['pylons.paths']['controllers'], + rmap = Mapper(directory=config['pylons.paths']['controllers'], always_scan=config['debug']) - map.minimization = False - map.explicit = False + rmap.minimization = False + rmap.explicit = False def check_repo(environ, match_dict): """ @@ -27,21 +28,22 @@ def make_map(config): # The ErrorController route (handles 404/500 error pages); it should # likely stay at the top, ensuring it can always be resolved - map.connect('/error/{action}', controller='error') - map.connect('/error/{action}/{id}', controller='error') + rmap.connect('/error/{action}', controller='error') + rmap.connect('/error/{action}/{id}', controller='error') #========================================================================== # CUSTOM ROUTES HERE #========================================================================== #MAIN PAGE - map.connect('home', '/', controller='home', action='index') - map.connect('bugtracker', "http://bitbucket.org/marcinkuzminski/rhodecode/issues", _static=True) - map.connect('gpl_license', "http://www.gnu.org/licenses/gpl.html", _static=True) - map.connect('rhodecode_official', "http://rhodecode.org", _static=True) + rmap.connect('home', '/', controller='home', action='index') + rmap.connect('bugtracker', + "http://bitbucket.org/marcinkuzminski/rhodecode/issues", + _static=True) + rmap.connect('rhodecode_official', "http://rhodecode.org", _static=True) #ADMIN REPOSITORY REST ROUTES - with map.submapper(path_prefix='/_admin', controller='admin/repos') as m: + with rmap.submapper(path_prefix='/_admin', controller='admin/repos') as m: m.connect("repos", "/repos", action="create", conditions=dict(method=["POST"])) m.connect("repos", "/repos", @@ -83,134 +85,160 @@ def make_map(config): action="repo_cache", conditions=dict(method=["DELETE"], function=check_repo)) #ADMIN USER REST ROUTES - map.resource('user', 'users', controller='admin/users', path_prefix='/_admin') + rmap.resource('user', 'users', controller='admin/users', + path_prefix='/_admin') #ADMIN PERMISSIONS REST ROUTES - map.resource('permission', 'permissions', controller='admin/permissions', path_prefix='/_admin') - + rmap.resource('permission', 'permissions', controller='admin/permissions', + path_prefix='/_admin') ##ADMIN LDAP SETTINGS - map.connect('ldap_settings', '/_admin/ldap', controller='admin/ldap_settings', - action='ldap_settings', conditions=dict(method=["POST"])) - map.connect('ldap_home', '/_admin/ldap', controller='admin/ldap_settings',) - - + rmap.connect('ldap_settings', '/_admin/ldap', + controller='admin/ldap_settings', action='ldap_settings', + conditions=dict(method=["POST"])) + rmap.connect('ldap_home', '/_admin/ldap', + controller='admin/ldap_settings',) #ADMIN SETTINGS REST ROUTES - with map.submapper(path_prefix='/_admin', controller='admin/settings') as m: + with rmap.submapper(path_prefix='/_admin', + controller='admin/settings') as m: m.connect("admin_settings", "/settings", - action="create", conditions=dict(method=["POST"])) + action="create", conditions=dict(method=["POST"])) m.connect("admin_settings", "/settings", - action="index", conditions=dict(method=["GET"])) + action="index", conditions=dict(method=["GET"])) m.connect("formatted_admin_settings", "/settings.{format}", - action="index", conditions=dict(method=["GET"])) + action="index", conditions=dict(method=["GET"])) m.connect("admin_new_setting", "/settings/new", - action="new", conditions=dict(method=["GET"])) + action="new", conditions=dict(method=["GET"])) m.connect("formatted_admin_new_setting", "/settings/new.{format}", - action="new", conditions=dict(method=["GET"])) + action="new", conditions=dict(method=["GET"])) m.connect("/settings/{setting_id}", - action="update", conditions=dict(method=["PUT"])) + action="update", conditions=dict(method=["PUT"])) m.connect("/settings/{setting_id}", - action="delete", conditions=dict(method=["DELETE"])) + action="delete", conditions=dict(method=["DELETE"])) m.connect("admin_edit_setting", "/settings/{setting_id}/edit", - action="edit", conditions=dict(method=["GET"])) - m.connect("formatted_admin_edit_setting", "/settings/{setting_id}.{format}/edit", - action="edit", conditions=dict(method=["GET"])) + action="edit", conditions=dict(method=["GET"])) + m.connect("formatted_admin_edit_setting", + "/settings/{setting_id}.{format}/edit", + action="edit", conditions=dict(method=["GET"])) m.connect("admin_setting", "/settings/{setting_id}", - action="show", conditions=dict(method=["GET"])) + action="show", conditions=dict(method=["GET"])) m.connect("formatted_admin_setting", "/settings/{setting_id}.{format}", - action="show", conditions=dict(method=["GET"])) + action="show", conditions=dict(method=["GET"])) m.connect("admin_settings_my_account", "/my_account", - action="my_account", conditions=dict(method=["GET"])) + action="my_account", conditions=dict(method=["GET"])) m.connect("admin_settings_my_account_update", "/my_account_update", - action="my_account_update", conditions=dict(method=["PUT"])) + action="my_account_update", conditions=dict(method=["PUT"])) m.connect("admin_settings_create_repository", "/create_repository", - action="create_repository", conditions=dict(method=["GET"])) + action="create_repository", conditions=dict(method=["GET"])) #ADMIN MAIN PAGES - with map.submapper(path_prefix='/_admin', controller='admin/admin') as m: - m.connect('admin_home', '', action='index')#main page + with rmap.submapper(path_prefix='/_admin', controller='admin/admin') as m: + m.connect('admin_home', '', action='index') m.connect('admin_add_repo', '/add_repo/{new_repo:[a-z0-9\. _-]*}', action='add_repo') - #USER JOURNAL - map.connect('journal', '/_admin/journal', controller='journal',) - map.connect('toggle_following', '/_admin/toggle_following', controller='journal', - action='toggle_following', conditions=dict(method=["POST"])) - + rmap.connect('journal', '/_admin/journal', controller='journal',) + rmap.connect('toggle_following', '/_admin/toggle_following', + controller='journal', action='toggle_following', + conditions=dict(method=["POST"])) #SEARCH - map.connect('search', '/_admin/search', controller='search',) - map.connect('search_repo', '/_admin/search/{search_repo:.*}', controller='search') + rmap.connect('search', '/_admin/search', controller='search',) + rmap.connect('search_repo', '/_admin/search/{search_repo:.*}', + controller='search') #LOGIN/LOGOUT/REGISTER/SIGN IN - map.connect('login_home', '/_admin/login', controller='login') - map.connect('logout_home', '/_admin/logout', controller='login', action='logout') - map.connect('register', '/_admin/register', controller='login', action='register') - map.connect('reset_password', '/_admin/password_reset', controller='login', action='password_reset') + rmap.connect('login_home', '/_admin/login', controller='login') + rmap.connect('logout_home', '/_admin/logout', controller='login', + action='logout') + rmap.connect('register', '/_admin/register', controller='login', + action='register') + rmap.connect('reset_password', '/_admin/password_reset', + controller='login', action='password_reset') #FEEDS - map.connect('rss_feed_home', '/{repo_name:.*}/feed/rss', + rmap.connect('rss_feed_home', '/{repo_name:.*}/feed/rss', controller='feed', action='rss', conditions=dict(function=check_repo)) - map.connect('atom_feed_home', '/{repo_name:.*}/feed/atom', + rmap.connect('atom_feed_home', '/{repo_name:.*}/feed/atom', controller='feed', action='atom', conditions=dict(function=check_repo)) - #REPOSITORY ROUTES - map.connect('changeset_home', '/{repo_name:.*}/changeset/{revision}', + rmap.connect('changeset_home', '/{repo_name:.*}/changeset/{revision}', controller='changeset', revision='tip', conditions=dict(function=check_repo)) - map.connect('raw_changeset_home', '/{repo_name:.*}/raw-changeset/{revision}', - controller='changeset', action='raw_changeset', revision='tip', - conditions=dict(function=check_repo)) - map.connect('summary_home_', '/{repo_name:.*}', + + rmap.connect('raw_changeset_home', + '/{repo_name:.*}/raw-changeset/{revision}', + controller='changeset', action='raw_changeset', + revision='tip', conditions=dict(function=check_repo)) + + rmap.connect('summary_home_', '/{repo_name:.*}', controller='summary', conditions=dict(function=check_repo)) - map.connect('summary_home', '/{repo_name:.*}/summary', + + rmap.connect('summary_home', '/{repo_name:.*}/summary', controller='summary', conditions=dict(function=check_repo)) - map.connect('shortlog_home', '/{repo_name:.*}/shortlog', + + rmap.connect('shortlog_home', '/{repo_name:.*}/shortlog', controller='shortlog', conditions=dict(function=check_repo)) - map.connect('branches_home', '/{repo_name:.*}/branches', + + rmap.connect('branches_home', '/{repo_name:.*}/branches', controller='branches', conditions=dict(function=check_repo)) - map.connect('tags_home', '/{repo_name:.*}/tags', + + rmap.connect('tags_home', '/{repo_name:.*}/tags', controller='tags', conditions=dict(function=check_repo)) - map.connect('changelog_home', '/{repo_name:.*}/changelog', + + rmap.connect('changelog_home', '/{repo_name:.*}/changelog', controller='changelog', conditions=dict(function=check_repo)) - map.connect('files_home', '/{repo_name:.*}/files/{revision}/{f_path:.*}', + + rmap.connect('files_home', '/{repo_name:.*}/files/{revision}/{f_path:.*}', controller='files', revision='tip', f_path='', conditions=dict(function=check_repo)) - map.connect('files_diff_home', '/{repo_name:.*}/diff/{f_path:.*}', + + rmap.connect('files_diff_home', '/{repo_name:.*}/diff/{f_path:.*}', controller='files', action='diff', revision='tip', f_path='', conditions=dict(function=check_repo)) - map.connect('files_rawfile_home', '/{repo_name:.*}/rawfile/{revision}/{f_path:.*}', - controller='files', action='rawfile', revision='tip', f_path='', - conditions=dict(function=check_repo)) - map.connect('files_raw_home', '/{repo_name:.*}/raw/{revision}/{f_path:.*}', - controller='files', action='raw', revision='tip', f_path='', - conditions=dict(function=check_repo)) - map.connect('files_annotate_home', '/{repo_name:.*}/annotate/{revision}/{f_path:.*}', - controller='files', action='annotate', revision='tip', f_path='', - conditions=dict(function=check_repo)) - map.connect('files_archive_home', '/{repo_name:.*}/archive/{revision}/{fileformat}', - controller='files', action='archivefile', revision='tip', - conditions=dict(function=check_repo)) - map.connect('repo_settings_delete', '/{repo_name:.*}/settings', - controller='settings', action="delete", - conditions=dict(method=["DELETE"], function=check_repo)) - map.connect('repo_settings_update', '/{repo_name:.*}/settings', - controller='settings', action="update", - conditions=dict(method=["PUT"], function=check_repo)) - map.connect('repo_settings_home', '/{repo_name:.*}/settings', - controller='settings', action='index', - conditions=dict(function=check_repo)) + + rmap.connect('files_rawfile_home', + '/{repo_name:.*}/rawfile/{revision}/{f_path:.*}', + controller='files', action='rawfile', revision='tip', + f_path='', conditions=dict(function=check_repo)) + + rmap.connect('files_raw_home', + '/{repo_name:.*}/raw/{revision}/{f_path:.*}', + controller='files', action='raw', revision='tip', f_path='', + conditions=dict(function=check_repo)) + + rmap.connect('files_annotate_home', + '/{repo_name:.*}/annotate/{revision}/{f_path:.*}', + controller='files', action='annotate', revision='tip', + f_path='', conditions=dict(function=check_repo)) - map.connect('repo_fork_create_home', '/{repo_name:.*}/fork', + rmap.connect('files_archive_home', + '/{repo_name:.*}/archive/{revision}/{fileformat}', + controller='files', action='archivefile', revision='tip', + conditions=dict(function=check_repo)) + + rmap.connect('repo_settings_delete', '/{repo_name:.*}/settings', + controller='settings', action="delete", + conditions=dict(method=["DELETE"], function=check_repo)) + + rmap.connect('repo_settings_update', '/{repo_name:.*}/settings', + controller='settings', action="update", + conditions=dict(method=["PUT"], function=check_repo)) + + rmap.connect('repo_settings_home', '/{repo_name:.*}/settings', + controller='settings', action='index', + conditions=dict(function=check_repo)) + + rmap.connect('repo_fork_create_home', '/{repo_name:.*}/fork', controller='settings', action='fork_create', conditions=dict(function=check_repo, method=["POST"])) - map.connect('repo_fork_home', '/{repo_name:.*}/fork', + rmap.connect('repo_fork_home', '/{repo_name:.*}/fork', controller='settings', action='fork', conditions=dict(function=check_repo)) - return map + return rmap