comparison pylons_app/controllers/users.py @ 151:988477a05db6

moved sqlalchemy session to base.
author Marcin Kuzminski <marcin@python-works.com>
date Sat, 15 May 2010 19:05:13 +0200
parents 20dc7a5eb748
children b68b2246e5a6
comparison
equal deleted inserted replaced
150:b15d4ac75004 151:988477a05db6
3 from pylons import request, response, session, tmpl_context as c, url, app_globals as g 3 from pylons import request, response, session, tmpl_context as c, url, app_globals as g
4 from pylons.controllers.util import abort, redirect 4 from pylons.controllers.util import abort, redirect
5 5
6 from pylons_app.lib.base import BaseController, render 6 from pylons_app.lib.base import BaseController, render
7 from formencode import htmlfill 7 from formencode import htmlfill
8 from pylons_app.model import meta
9 from pylons_app.model.db import Users, UserLogs 8 from pylons_app.model.db import Users, UserLogs
10 from pylons_app.lib.auth import authenticate 9 from pylons_app.lib.auth import authenticate
11 import crypt 10 import crypt
12 11
13 log = logging.getLogger(__name__) 12 log = logging.getLogger(__name__)
18 # file has a resource setup: 17 # file has a resource setup:
19 # map.resource('user', 'users') 18 # map.resource('user', 'users')
20 19
21 @authenticate 20 @authenticate
22 def __before__(self): 21 def __before__(self):
23
24 c.admin_user = session.get('admin_user') 22 c.admin_user = session.get('admin_user')
25 c.admin_username = session.get('admin_username') 23 c.admin_username = session.get('admin_username')
26 self.sa = meta.Session
27 24
28 def index(self, format='html'): 25 def index(self, format='html'):
29 """GET /users: All items in the collection""" 26 """GET /users: All items in the collection"""
30 # url('users') 27 # url('users')
31 28