diff options
| author | Chris McDonough <chrism@plope.com> | 2010-11-04 03:58:53 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-11-04 03:58:53 -0400 |
| commit | 39f8a04ca89dfb43c79bf3c4c31400061a5cf1e0 (patch) | |
| tree | 38084b3296a1cb44de0deef5dd4059ae938f93d3 /docs/tutorials/wiki2/src | |
| parent | b2adfe7c10bff8edd06a76df3c638768e30b6bc3 (diff) | |
| download | pyramid-39f8a04ca89dfb43c79bf3c4c31400061a5cf1e0.tar.gz pyramid-39f8a04ca89dfb43c79bf3c4c31400061a5cf1e0.tar.bz2 pyramid-39f8a04ca89dfb43c79bf3c4c31400061a5cf1e0.zip | |
fix wiki2 tutorial (it was busted)
Diffstat (limited to 'docs/tutorials/wiki2/src')
| -rw-r--r-- | docs/tutorials/wiki2/src/authorization/tutorial/__init__.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py b/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py index 8c93e5d5a..a47b6dc32 100644 --- a/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py +++ b/docs/tutorials/wiki2/src/authorization/tutorial/__init__.py @@ -5,6 +5,7 @@ from pyramid.authorization import ACLAuthorizationPolicy from paste.deploy.converters import asbool from tutorial.models import initialize_sql +from tutorial.security import groupfinder def app(global_config, **settings): """ This function returns a WSGI application. @@ -18,7 +19,7 @@ def app(global_config, **settings): db_echo = settings.get('db_echo', 'false') initialize_sql(db_string, asbool(db_echo)) authn_policy = AuthTktAuthenticationPolicy( - 'sosecret', callback='tutorial.security.groupfinder') + 'sosecret', callback=groupfinder) authz_policy = ACLAuthorizationPolicy() config = Configurator(settings=settings, root_factory='tutorial.models.RootFactory', @@ -27,6 +28,11 @@ def app(global_config, **settings): config.begin() config.add_static_view('static', 'templates/static') config.add_route('view_wiki', '/', view='tutorial.views.view_wiki') + config.add_route('login', '/login', + view='tutorial.login.login', + view_renderer='tutorial:templates/login.pt') + config.add_route('logout', '/logout', + view='tutorial.login.logout') config.add_route('view_page', '/:pagename', view='tutorial.views.view_page', view_renderer='tutorial:templates/view.pt') @@ -38,11 +44,6 @@ def app(global_config, **settings): view='tutorial.views.edit_page', view_renderer='tutorial:templates/edit.pt', view_permission='edit') - config.add_route('login', '/login', - view='tutorial.login.login', - view_renderer='tutorial:templates/login.pt') - config.add_route('logout', '/logout', - view='tutorial.login.loout') config.add_view('tutorial.login.login', renderer='tutorial:templates/login.pt', context='pyramid.exceptions.Forbidden') |