Changeset - 04dded89aa87
Parent rev.
Child rev.
[Not reviewed]
default
0 1 0
Mads Kiilerich - 6 years ago 2019-12-01 20:24:28
mads@kiilerich.com
Grafted from: 30834d8b13ae
routing: drop action='index' - that is already the default

These default actions were already left out in some places - now be consistent
about it.
1 file changed with 13 insertions and 14 deletions:
kallithea/config/routing.py
13
14
0 comments (0 inline, 0 general)
kallithea/config/routing.py
➞
Show inline comments
 
@@ -77,60 +77,60 @@ def make_map(config):
 
        :param match_dict:
 
        """
 
        return True
 

			




	
	
	
		
 
    def check_int(environ, match_dict):

			




	
	
	
		
 
        return match_dict.get('id').isdigit()

			




	
	
	
		
 

			




	
	
	
		
 
    #==========================================================================

			




	
	
	
		
 
    # CUSTOM ROUTES HERE

			




	
	
	
		
 
    #==========================================================================

			




	
	
	
		
 

			




	
	
	
		
 
    # MAIN PAGE

			




	
	
	
		
 
    rmap.connect('home', '/', controller='home', action='index')

			




	
	
	
		
 
    rmap.connect('home', '/', controller='home')

			




	
	
	
		
 
    rmap.connect('about', '/about', controller='home', action='about')

			




	
	
	
		
 
    rmap.redirect('/favicon.ico', '/images/favicon.ico')

			




	
	
	
		
 
    rmap.connect('repo_switcher_data', '/_repos', controller='home',

			




	
	
	
		
 
                 action='repo_switcher_data')

			




	
	
	
		
 
    rmap.connect('users_and_groups_data', '/_users_and_groups', controller='home',

			




	
	
	
		
 
                 action='users_and_groups_data')

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('rst_help',

			




	
	
	
		
 
                 "http://docutils.sourceforge.net/docs/user/rst/quickref.html",

			




	
	
	
		
 
                 _static=True)

			




	
	
	
		
 
    rmap.connect('kallithea_project_url', "https://kallithea-scm.org/", _static=True)

			




	
	
	
		
 
    rmap.connect('issues_url', 'https://bitbucket.org/conservancy/kallithea/issues', _static=True)

			




	
	
	
		
 

			




	
	
	
		
 
    # ADMIN REPOSITORY ROUTES

			




	
	
	
		
 
    with rmap.submapper(path_prefix=ADMIN_PREFIX,

			




	
	
	
		
 
                        controller='admin/repos') as m:

			




	
	
	
		
 
        m.connect("repos", "/repos",

			




	
	
	
		
 
                  action="create", conditions=dict(method=["POST"]))

			




	
	
	
		
 
        m.connect("repos", "/repos",

			




	
	
	
		
 
                  action="index", conditions=dict(method=["GET"]))

			




	
	
	
		
 
                  conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("new_repo", "/create_repository",

			




	
	
	
		
 
                  action="create_repository", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("update_repo", "/repos/{repo_name:.*?}",

			




	
	
	
		
 
                  action="update", conditions=dict(method=["POST"],

			




	
	
	
		
 
                  function=check_repo))

			




	
	
	
		
 
        m.connect("delete_repo", "/repos/{repo_name:.*?}/delete",

			




	
	
	
		
 
                  action="delete", conditions=dict(method=["POST"]))

			




	
	
	
		
 

			




	
	
	
		
 
    # ADMIN REPOSITORY GROUPS ROUTES

			




	
	
	
		
 
    with rmap.submapper(path_prefix=ADMIN_PREFIX,

			




	
	
	
		
 
                        controller='admin/repo_groups') as m:

			




	
	
	
		
 
        m.connect("repos_groups", "/repo_groups",

			




	
	
	
		
 
                  action="create", conditions=dict(method=["POST"]))

			




	
	
	
		
 
        m.connect("repos_groups", "/repo_groups",

			




	
	
	
		
 
                  action="index", conditions=dict(method=["GET"]))

			




	
	
	
		
 
                  conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("new_repos_group", "/repo_groups/new",

			




	
	
	
		
 
                  action="new", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("update_repos_group", "/repo_groups/{group_name:.*?}",

			




	
	
	
		
 
                  action="update", conditions=dict(method=["POST"],

			




	
	
	
		
 
                                                   function=check_group))

			




	
	
	
		
 

			




	
	
	
		
 
        m.connect("repos_group", "/repo_groups/{group_name:.*?}",

			




	
	
	
		
 
                  action="show", conditions=dict(method=["GET"],

			




	
	
	
		
 
                                                 function=check_group))

			




	
	
	
		
 

			




	
	
	
		
 
        # EXTRAS REPO GROUP ROUTES

			




	
	
	
		
 
        m.connect("edit_repo_group", "/repo_groups/{group_name:.*?}/edit",

			




	
	
		
 
@@ -152,27 +152,27 @@ def make_map(config):

			




	
	
	
		
 
                  conditions=dict(method=["POST"], function=check_group))

			




	
	
	
		
 

			




	
	
	
		
 
        m.connect("delete_repo_group", "/repo_groups/{group_name:.*?}/delete",

			




	
	
	
		
 
                  action="delete", conditions=dict(method=["POST"],

			




	
	
	
		
 
                                                   function=check_group_skip_path))

			




	
	
	
		
 

			




	
	
	
		
 
    # ADMIN USER ROUTES

			




	
	
	
		
 
    with rmap.submapper(path_prefix=ADMIN_PREFIX,

			




	
	
	
		
 
                        controller='admin/users') as m:

			




	
	
	
		
 
        m.connect("new_user", "/users/new",

			




	
	
	
		
 
                  action="create", conditions=dict(method=["POST"]))

			




	
	
	
		
 
        m.connect("users", "/users",

			




	
	
	
		
 
                  action="index", conditions=dict(method=["GET"]))

			




	
	
	
		
 
                  conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("formatted_users", "/users.{format}",

			




	
	
	
		
 
                  action="index", conditions=dict(method=["GET"]))

			




	
	
	
		
 
                  conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("new_user", "/users/new",

			




	
	
	
		
 
                  action="new", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("update_user", "/users/{id}",

			




	
	
	
		
 
                  action="update", conditions=dict(method=["POST"]))

			




	
	
	
		
 
        m.connect("delete_user", "/users/{id}/delete",

			




	
	
	
		
 
                  action="delete", conditions=dict(method=["POST"]))

			




	
	
	
		
 
        m.connect("edit_user", "/users/{id}/edit",

			




	
	
	
		
 
                  action="edit", conditions=dict(method=["GET"]))

			




	
	
	
		
 

			




	
	
	
		
 
        # EXTRAS USER ROUTES

			




	
	
	
		
 
        m.connect("edit_user_advanced", "/users/{id}/edit/advanced",

			




	
	
	
		
 
                  action="edit_advanced", conditions=dict(method=["GET"]))

			




	
	
		
 
@@ -207,25 +207,25 @@ def make_map(config):

			




	
	
	
		
 
                  action="edit_ips", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("edit_user_ips_update", "/users/{id}/edit/ips",

			




	
	
	
		
 
                  action="add_ip", conditions=dict(method=["POST"]))

			




	
	
	
		
 
        m.connect("edit_user_ips_delete", "/users/{id}/edit/ips/delete",

			




	
	
	
		
 
                  action="delete_ip", conditions=dict(method=["POST"]))

			




	
	
	
		
 

			




	
	
	
		
 
    # ADMIN USER GROUPS REST ROUTES

			




	
	
	
		
 
    with rmap.submapper(path_prefix=ADMIN_PREFIX,

			




	
	
	
		
 
                        controller='admin/user_groups') as m:

			




	
	
	
		
 
        m.connect("users_groups", "/user_groups",

			




	
	
	
		
 
                  action="create", conditions=dict(method=["POST"]))

			




	
	
	
		
 
        m.connect("users_groups", "/user_groups",

			




	
	
	
		
 
                  action="index", conditions=dict(method=["GET"]))

			




	
	
	
		
 
                  conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("new_users_group", "/user_groups/new",

			




	
	
	
		
 
                  action="new", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("update_users_group", "/user_groups/{id}",

			




	
	
	
		
 
                  action="update", conditions=dict(method=["POST"]))

			




	
	
	
		
 
        m.connect("delete_users_group", "/user_groups/{id}/delete",

			




	
	
	
		
 
                  action="delete", conditions=dict(method=["POST"]))

			




	
	
	
		
 
        m.connect("edit_users_group", "/user_groups/{id}/edit",

			




	
	
	
		
 
                  action="edit", conditions=dict(method=["GET"]),

			




	
	
	
		
 
                  function=check_user_group)

			




	
	
	
		
 

			




	
	
	
		
 
        # EXTRAS USER GROUP ROUTES

			




	
	
	
		
 
        m.connect("edit_user_group_default_perms", "/user_groups/{id}/edit/default_perms",

			




	
	
		
 
@@ -254,26 +254,25 @@ def make_map(config):

			




	
	
	
		
 
        m.connect("admin_permissions", "/permissions",

			




	
	
	
		
 
                  action="permission_globals", conditions=dict(method=["GET"]))

			




	
	
	
		
 

			




	
	
	
		
 
        m.connect("admin_permissions_ips", "/permissions/ips",

			




	
	
	
		
 
                  action="permission_ips", conditions=dict(method=["GET"]))

			




	
	
	
		
 

			




	
	
	
		
 
        m.connect("admin_permissions_perms", "/permissions/perms",

			




	
	
	
		
 
                  action="permission_perms", conditions=dict(method=["GET"]))

			




	
	
	
		
 

			




	
	
	
		
 
    # ADMIN DEFAULTS ROUTES

			




	
	
	
		
 
    with rmap.submapper(path_prefix=ADMIN_PREFIX,

			




	
	
	
		
 
                        controller='admin/defaults') as m:

			




	
	
	
		
 
        m.connect('defaults', '/defaults',

			




	
	
	
		
 
                  action="index")

			




	
	
	
		
 
        m.connect('defaults', '/defaults')

			




	
	
	
		
 
        m.connect('defaults_update', 'defaults/{id}/update',

			




	
	
	
		
 
                  action="update", conditions=dict(method=["POST"]))

			




	
	
	
		
 

			




	
	
	
		
 
    # ADMIN AUTH SETTINGS

			




	
	
	
		
 
    rmap.connect('auth_settings', '%s/auth' % ADMIN_PREFIX,

			




	
	
	
		
 
                 controller='admin/auth_settings', action='auth_settings',

			




	
	
	
		
 
                 conditions=dict(method=["POST"]))

			




	
	
	
		
 
    rmap.connect('auth_home', '%s/auth' % ADMIN_PREFIX,

			




	
	
	
		
 
                 controller='admin/auth_settings')

			




	
	
	
		
 

			




	
	
	
		
 
    # ADMIN SETTINGS ROUTES

			




	
	
	
		
 
    with rmap.submapper(path_prefix=ADMIN_PREFIX,

			




	
	
		
 
@@ -361,25 +360,25 @@ def make_map(config):

			




	
	
	
		
 
                  action="my_account_ssh_keys", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("my_account_ssh_keys", "/my_account/ssh_keys",

			




	
	
	
		
 
                  action="my_account_ssh_keys_add", conditions=dict(method=["POST"]))

			




	
	
	
		
 
        m.connect("my_account_ssh_keys_delete", "/my_account/ssh_keys/delete",

			




	
	
	
		
 
                  action="my_account_ssh_keys_delete", conditions=dict(method=["POST"]))

			




	
	
	
		
 

			




	
	
	
		
 
    # ADMIN GIST

			




	
	
	
		
 
    with rmap.submapper(path_prefix=ADMIN_PREFIX,

			




	
	
	
		
 
                        controller='admin/gists') as m:

			




	
	
	
		
 
        m.connect("gists", "/gists",

			




	
	
	
		
 
                  action="create", conditions=dict(method=["POST"]))

			




	
	
	
		
 
        m.connect("gists", "/gists",

			




	
	
	
		
 
                  action="index", conditions=dict(method=["GET"]))

			




	
	
	
		
 
                  conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("new_gist", "/gists/new",

			




	
	
	
		
 
                  action="new", conditions=dict(method=["GET"]))

			




	
	
	
		
 

			




	
	
	
		
 
        m.connect("gist_delete", "/gists/{gist_id}/delete",

			




	
	
	
		
 
                  action="delete", conditions=dict(method=["POST"]))

			




	
	
	
		
 
        m.connect("edit_gist", "/gists/{gist_id}/edit",

			




	
	
	
		
 
                  action="edit", conditions=dict(method=["GET", "POST"]))

			




	
	
	
		
 
        m.connect("edit_gist_check_revision", "/gists/{gist_id}/edit/check_revision",

			




	
	
	
		
 
                  action="check_revision", conditions=dict(method=["POST"]))

			




	
	
	
		
 

			




	
	
	
		
 
        m.connect("gist", "/gists/{gist_id}",

			




	
	
	
		
 
                  action="show", conditions=dict(method=["GET"]))

			




	
	
		
 
@@ -387,37 +386,37 @@ def make_map(config):

			




	
	
	
		
 
                  revision="tip",

			




	
	
	
		
 
                  action="show", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("formatted_gist", "/gists/{gist_id}/{revision}/{format}",

			




	
	
	
		
 
                  revision="tip",

			




	
	
	
		
 
                  action="show", conditions=dict(method=["GET"]))

			




	
	
	
		
 
        m.connect("formatted_gist_file", "/gists/{gist_id}/{revision}/{format}/{f_path:.*}",

			




	
	
	
		
 
                  revision='tip',

			




	
	
	
		
 
                  action="show", conditions=dict(method=["GET"]))

			




	
	
	
		
 

			




	
	
	
		
 
    # ADMIN MAIN PAGES

			




	
	
	
		
 
    with rmap.submapper(path_prefix=ADMIN_PREFIX,

			




	
	
	
		
 
                        controller='admin/admin') as m:

			




	
	
	
		
 
        m.connect('admin_home', '', action='index')

			




	
	
	
		
 
        m.connect('admin_home', '')

			




	
	
	
		
 
        m.connect('admin_add_repo', '/add_repo/{new_repo:[a-z0-9. _-]*}',

			




	
	
	
		
 
                  action='add_repo')

			




	
	
	
		
 
    #==========================================================================

			




	
	
	
		
 
    # API V2

			




	
	
	
		
 
    #==========================================================================

			




	
	
	
		
 
    with rmap.submapper(path_prefix=ADMIN_PREFIX, controller='api/api',

			




	
	
	
		
 
                        action='_dispatch') as m:

			




	
	
	
		
 
        m.connect('api', '/api')

			




	
	
	
		
 

			




	
	
	
		
 
    # USER JOURNAL

			




	
	
	
		
 
    rmap.connect('journal', '%s/journal' % ADMIN_PREFIX,

			




	
	
	
		
 
                 controller='journal', action='index')

			




	
	
	
		
 
                 controller='journal')

			




	
	
	
		
 
    rmap.connect('journal_rss', '%s/journal/rss' % ADMIN_PREFIX,

			




	
	
	
		
 
                 controller='journal', action='journal_rss')

			




	
	
	
		
 
    rmap.connect('journal_atom', '%s/journal/atom' % ADMIN_PREFIX,

			




	
	
	
		
 
                 controller='journal', action='journal_atom')

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('public_journal', '%s/public_journal' % ADMIN_PREFIX,

			




	
	
	
		
 
                 controller='journal', action="public_journal")

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('public_journal_rss', '%s/public_journal/rss' % ADMIN_PREFIX,

			




	
	
	
		
 
                 controller='journal', action="public_journal_rss")

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('public_journal_rss_old', '%s/public_journal_rss' % ADMIN_PREFIX,

			




	
	
		
 
@@ -593,39 +592,39 @@ def make_map(config):

			




	
	
	
		
 
                conditions=dict(function=check_repo))

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('changeset_comment_delete',

			




	
	
	
		
 
                 '/{repo_name:.*?}/changeset-comment/{comment_id}/delete',

			




	
	
	
		
 
                controller='changeset', action='delete_comment',

			




	
	
	
		
 
                conditions=dict(function=check_repo, method=["POST"]))

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('changeset_info', '/changeset_info/{repo_name:.*?}/{revision}',

			




	
	
	
		
 
                 controller='changeset', action='changeset_info')

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('compare_home',

			




	
	
	
		
 
                 '/{repo_name:.*?}/compare',

			




	
	
	
		
 
                 controller='compare', action='index',

			




	
	
	
		
 
                 controller='compare',

			




	
	
	
		
 
                 conditions=dict(function=check_repo))

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('compare_url',

			




	
	
	
		
 
                 '/{repo_name:.*?}/compare/{org_ref_type}@{org_ref_name:.*?}...{other_ref_type}@{other_ref_name:.*?}',

			




	
	
	
		
 
                 controller='compare', action='compare',

			




	
	
	
		
 
                 conditions=dict(function=check_repo),

			




	
	
	
		
 
                 requirements=dict(

			




	
	
	
		
 
                            org_ref_type='(branch|book|tag|rev|__other_ref_type__)',

			




	
	
	
		
 
                            other_ref_type='(branch|book|tag|rev|__org_ref_type__)')

			




	
	
	
		
 
                 )

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('pullrequest_home',

			




	
	
	
		
 
                 '/{repo_name:.*?}/pull-request/new', controller='pullrequests',

			




	
	
	
		
 
                 action='index', conditions=dict(function=check_repo,

			




	
	
	
		
 
                 conditions=dict(function=check_repo,

			




	
	
	
		
 
                                                 method=["GET"]))

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('pullrequest_repo_info',

			




	
	
	
		
 
                 '/{repo_name:.*?}/pull-request-repo-info',

			




	
	
	
		
 
                 controller='pullrequests', action='repo_info',

			




	
	
	
		
 
                 conditions=dict(function=check_repo, method=["GET"]))

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('pullrequest',

			




	
	
	
		
 
                 '/{repo_name:.*?}/pull-request/new', controller='pullrequests',

			




	
	
	
		
 
                 action='create', conditions=dict(function=check_repo,

			




	
	
	
		
 
                                                  method=["POST"]))

			




	
	
	
		
 

			




	
	
		
 
@@ -710,25 +709,25 @@ def make_map(config):

			




	
	
	
		
 
    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='index', revision='tip',

			




	
	
	
		
 
                 controller='files', revision='tip',

			




	
	
	
		
 
                 f_path='', annotate=True, conditions=dict(function=check_repo))

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('files_edit_home',

			




	
	
	
		
 
                 '/{repo_name:.*?}/edit/{revision}/{f_path:.*}',

			




	
	
	
		
 
                 controller='files', action='edit', revision='tip',

			




	
	
	
		
 
                 f_path='', conditions=dict(function=check_repo))

			




	
	
	
		
 

			




	
	
	
		
 
    rmap.connect('files_add_home',

			




	
	
	
		
 
                 '/{repo_name:.*?}/add/{revision}/{f_path:.*}',

			




	
	
	
		
 
                 controller='files', action='add', revision='tip',

			




	
	
	
		
 
                 f_path='', conditions=dict(function=check_repo))

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.