##// END OF EJS Templates
moved sqlalchemy session to base.
marcink -
r151:988477a0 default
parent child Browse files
Show More
@@ -4,7 +4,6 b' from pylons import request, response, se'
4 4 from pylons.controllers.util import abort, redirect
5 5 from pylons_app.lib import auth
6 6 from pylons_app.lib.base import BaseController, render
7 from pylons_app.model import meta
8 7 from pylons_app.model.db import Users, UserLogs
9 8 from pylons_app.lib.auth import authenticate
10 9 from pylons_app.model.hg_model import HgModel
@@ -21,10 +20,8 b' class ReposController(BaseController):'
21 20
22 21 @authenticate
23 22 def __before__(self):
24
25 23 c.admin_user = session.get('admin_user')
26 24 c.admin_username = session.get('admin_username')
27 self.sa = meta.Session
28 25
29 26 def index(self, format='html'):
30 27 """GET /repos: All items in the collection"""
@@ -5,7 +5,6 b' from pylons.controllers.util import abor'
5 5
6 6 from pylons_app.lib.base import BaseController, render
7 7 from formencode import htmlfill
8 from pylons_app.model import meta
9 8 from pylons_app.model.db import Users, UserLogs
10 9 from pylons_app.lib.auth import authenticate
11 10 import crypt
@@ -20,10 +19,8 b' class UsersController(BaseController):'
20 19
21 20 @authenticate
22 21 def __before__(self):
23
24 22 c.admin_user = session.get('admin_user')
25 23 c.admin_username = session.get('admin_username')
26 self.sa = meta.Session
27 24
28 25 def index(self, format='html'):
29 26 """GET /users: All items in the collection"""
@@ -21,6 +21,7 b' class BaseController(WSGIController):'
21 21 # the request is routed to. This routing information is
22 22 # available in environ['pylons.routes_dict']
23 23 c.repo_list = _get_repos()
24 self.sa = meta.Session
24 25 try:
25 26 return WSGIController.__call__(self, environ, start_response)
26 27 finally:
General Comments 0
You need to be logged in to leave comments. Login now