diff options
Diffstat (limited to 'jm2l/__init__.py')
| -rw-r--r-- | jm2l/__init__.py | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/jm2l/__init__.py b/jm2l/__init__.py index f5f3378..d7e6fe5 100644 --- a/jm2l/__init__.py +++ b/jm2l/__init__.py @@ -7,6 +7,7 @@ from sqlalchemy import engine_from_config from pyramid.renderers import render_to_response from .models import DBSession, get_user from .security import EntryFactory, groupfinder +from pyramid_mailer import mailer_factory_from_settings import locale def main(global_config, **settings): @@ -28,6 +29,7 @@ def main(global_config, **settings): authentication_policy=authentication_policy, authorization_policy=authorization_policy ) + config.registry['mailer'] = mailer_factory_from_settings(settings) config.add_renderer('json', JSON(indent=4)) config.add_renderer('jsonp', JSONP(param_name='callback')) config.set_session_factory(my_session_factory) @@ -38,9 +40,7 @@ def main(global_config, **settings): config.add_static_view('js', 'static/js', cache_max_age=3600) config.add_static_view('vendor', 'static/vendor', cache_max_age=3600) config.add_static_view('upload', 'upload', cache_max_age=3600) - - config.add_route('tester', '/tester') - + # ICal Routes config.add_route('progr_iCal', '/{year:\d+}/JM2L.ics') @@ -99,25 +99,9 @@ def main(global_config, **settings): config.add_route('bymail', '/sign/jm2l/{hash}') # Handle Multimedia and Uploads - config.add_route('media_uploadform', '/test2') config.add_route('media_view', '/image/{media_table:\w+}/{uid:\d+}/{name:.+}') config.add_route('media_upload', '/uploader/{media_table:\w+}/{uid:\d+}/proceed{sep:/*}{name:.*}') - # To Trash routes - config.add_route('test', '/test') - config.add_route('test2', '/toast{sep:/*}{uid:(\d+)?}') - - #config.add_route('link_user_entity', '/entity/{uid:(\d+)}/{year:\d+}/user/{user_id:(\d+)}') - #config.add_route('link_role_entity', '/entity/{uid:(\d+)}/{year:\d+}/role/{role_id:(\d+)}') - - - config.add_route('IntAdd', '/IntAdd/{modtype:\w+}') - config.add_route('IntProp', '/IntProp/{modtype:\w+}') - - config.add_route('blog', '/blog/{id:\d+}/{slug}') - config.add_route('blog_action', '/blog/{action}', - factory='jm2l.security.EntryFactory') - config.scan() return config.make_wsgi_app() |