# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 2010-06-30 15:14:47
# Node ID 8026872a10ee6f218890d64219d8f26e27dce415
# Parent  46b7d108ea7a8c809534a0344dd436736bbf37e8

Moved admin controllers to separate module

diff --git a/pylons_app/config/routing.py b/pylons_app/config/routing.py
--- a/pylons_app/config/routing.py
+++ b/pylons_app/config/routing.py
@@ -32,7 +32,7 @@ def make_map(config):
         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",
@@ -67,11 +67,11 @@ def make_map(config):
              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')
@@ -84,9 +84,11 @@ def make_map(config):
                 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))
diff --git a/pylons_app/controllers/admin/__init__.py b/pylons_app/controllers/admin/__init__.py
new file mode 100644
diff --git a/pylons_app/controllers/admin.py b/pylons_app/controllers/admin/admin.py
rename from pylons_app/controllers/admin.py
rename to pylons_app/controllers/admin/admin.py
diff --git a/pylons_app/controllers/permissions.py b/pylons_app/controllers/admin/permissions.py
rename from pylons_app/controllers/permissions.py
rename to pylons_app/controllers/admin/permissions.py
diff --git a/pylons_app/controllers/repos.py b/pylons_app/controllers/admin/repos.py
rename from pylons_app/controllers/repos.py
rename to pylons_app/controllers/admin/repos.py
diff --git a/pylons_app/controllers/users.py b/pylons_app/controllers/admin/users.py
rename from pylons_app/controllers/users.py
rename to pylons_app/controllers/admin/users.py