kallithea Changeset - 8026872a10ee

Changeset - 8026872a10ee

Parent rev.

Child rev.

[Not reviewed]

default

4 1 5

Marcin Kuzminski - 15 years ago 2010-06-30 17:14:47
marcin@python-works.com

Moved admin controllers to separate module

6 files changed with 6 insertions and 4 deletions:

pylons_app/config/routing.py

pylons_app/controllers/admin/__init__.py

new file

pylons_app/controllers/admin/admin.py

rename

pylons_app/controllers/admin/permissions.py

rename

pylons_app/controllers/admin/repos.py

rename

pylons_app/controllers/admin/users.py

rename

0 comments (0 inline, 0 general)

pylons_app/config/routing.py

➞

Show inline comments

@@ @@ -23,25 +23,25 @@ def make_map(config): @@
     map.connect('hg_home', '/', controller='hg', action='index')
     def check_repo(environ, match_dict):
         """
         check for valid repository for proper 404 handling
         @param environ:
         @param match_dict:
         """
         repo_name = match_dict.get('repo_name')
         return not cr(repo_name, config['base_path'])
     #REST routes
     with map.submapper(path_prefix='/_admin', controller='repos') as m:
+    with map.submapper(path_prefix='/_admin', controller='pylons_app.controllers.admin.repos:ReposController') as m:
         m.connect("repos", "/repos",
              action="create", conditions=dict(method=["POST"]))
         m.connect("repos", "/repos",
              action="index", conditions=dict(method=["GET"]))
         m.connect("formatted_repos", "/repos.{format}",
              action="index",
             conditions=dict(method=["GET"]))
         m.connect("new_repo", "/repos/new",
              action="new", conditions=dict(method=["GET"]))
         m.connect("formatted_new_repo", "/repos/new.{format}",
              action="new", conditions=dict(method=["GET"]))
         m.connect("/repos/{repo_name:.*}",
@@ @@ -58,44 +58,46 @@ def make_map(config): @@
                                             function=check_repo))
         m.connect("repo", "/repos/{repo_name:.*}",
              action="show", conditions=dict(method=["GET"],
                                             function=check_repo))
         m.connect("formatted_repo", "/repos/{repo_name:.*}.{format}",
              action="show", conditions=dict(method=["GET"],
                                             function=check_repo))
         #ajax delete repo perm user
         m.connect('delete_repo_user', "/repos_delete_user/{repo_name:.*}",
              action="delete_perm_user", conditions=dict(method=["DELETE"],
                                                         function=check_repo))
     map.resource('user', 'users', path_prefix='/_admin')
     map.resource('permission', 'permissions', path_prefix='/_admin')
     map.resource('user', 'users', controller='pylons_app.controllers.admin.users:UsersController', path_prefix='/_admin')
     map.resource('permission', 'permissions', controller='pylons_app.controllers.admin.permissions:PermissionsController', path_prefix='/_admin')
     #ADMIN
     with map.submapper(path_prefix='/_admin', controller='admin') as m:
+    with map.submapper(path_prefix='/_admin', controller='pylons_app.controllers.admin.admin:AdminController') as m:
         m.connect('admin_home', '', action='index')#main page
         m.connect('admin_add_repo', '/add_repo/{new_repo:[a-z0-9\. _-]*}',
                   action='add_repo')
     #FEEDS
     map.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',
                 controller='feed', action='atom',
                 conditions=dict(function=check_repo))
     #LOGIN/LOGOUT
     map.connect('login_home', '/login', controller='login')
     map.connect('logout_home', '/logout', controller='login', action='logout')
     #OTHERS
     map.connect('changeset_home', '/{repo_name:.*}/changeset/{revision}',
                 controller='changeset', revision='tip',
                 conditions=dict(function=check_repo))
     map.connect('summary_home', '/{repo_name:.*}/summary',
                 controller='summary', conditions=dict(function=check_repo))
     map.connect('shortlog_home', '/{repo_name:.*}/shortlog',
                 controller='shortlog', conditions=dict(function=check_repo))
     map.connect('branches_home', '/{repo_name:.*}/branches',
                 controller='branches', conditions=dict(function=check_repo))
     map.connect('tags_home', '/{repo_name:.*}/tags',
                 controller='tags', conditions=dict(function=check_repo))
     map.connect('changelog_home', '/{repo_name:.*}/changelog',

pylons_app/controllers/admin/__init__.py

➞

Show inline comments

new file 100644

pylons_app/controllers/admin/admin.py

➞

Show inline comments

file renamed from pylons_app/controllers/admin.py to pylons_app/controllers/admin/admin.py

pylons_app/controllers/admin/permissions.py

➞

Show inline comments

file renamed from pylons_app/controllers/permissions.py to pylons_app/controllers/admin/permissions.py

pylons_app/controllers/admin/repos.py

➞

Show inline comments

file renamed from pylons_app/controllers/repos.py to pylons_app/controllers/admin/repos.py

pylons_app/controllers/admin/users.py

➞

Show inline comments

file renamed from pylons_app/controllers/users.py to pylons_app/controllers/admin/users.py

0 comments (0 inline, 0 general)