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
 
@@ -83,13 +83,13 @@ def make_map(config):
 

			




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

			




	
	
	
		
 
    # 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')

			




	
	
		
 
@@ -103,13 +103,13 @@ def make_map(config):

			




	
	
	
		
 
    # 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",

			




	
	
		
 
@@ -118,13 +118,13 @@ def make_map(config):

			




	
	
	
		
 
    # 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))

			




	
	
	
		
 

			




	
	
		
 
@@ -158,15 +158,15 @@ def make_map(config):

			




	
	
	
		
 
    # 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"]))

			




	
	
		
 
@@ -213,13 +213,13 @@ def make_map(config):

			




	
	
	
		
 
    # 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"]))

			




	
	
		
 
@@ -260,14 +260,13 @@ def make_map(config):

			




	
	
	
		
 
        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',

			




	
	
		
 
@@ -367,13 +366,13 @@ def make_map(config):

			




	
	
	
		
 
    # 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",

			




	
	
		
 
@@ -393,25 +392,25 @@ def make_map(config):

			




	
	
	
		
 
                  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,

			




	
	
		
 
@@ -599,13 +598,13 @@ def make_map(config):

			




	
	
	
		
 

			




	
	
	
		
 
    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),

			




	
	
		
 
@@ -613,13 +612,13 @@ def make_map(config):

			




	
	
	
		
 
                            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"]))

			




	
	
		
 
@@ -716,13 +715,13 @@ def make_map(config):

			




	
	
	
		
 
                 '/{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))

			




        

    



    


    



    



      

      





    
    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.