Author: Gustavo
Date: Sat Nov 22 08:28:03 2008
New Revision: 5744
URL: http://trac.turbogears.org/changeset/5744
Log:
Updated the template according to the API changes in TurboGears and repoze.what.
Modified:
projects/tg.devtools/trunk/devtools/templates/turbogears/+package+/controllers/root.py_tmpl
projects/tg.devtools/trunk/devtools/templates/turbogears/+package+/lib/base.py_tmpl
Modified:
projects/tg.devtools/trunk/devtools/templates/turbogears/+package+/controllers/root.py_tmpl
==============================================================================
---
projects/tg.devtools/trunk/devtools/templates/turbogears/+package+/controllers/root.py_tmpl
(original)
+++
projects/tg.devtools/trunk/devtools/templates/turbogears/+package+/controllers/root.py_tmpl
Sat Nov 22 08:28:03 2008
@@ -1,6 +1,6 @@
"""Main Controller"""
from {{package}}.lib.base import BaseController
-from tg import expose, flash
+from tg import expose, flash, require
from pylons.i18n import ugettext as _
#from tg import redirect, validate
#from {{package}}.model import DBSession, metadata
@@ -29,12 +29,12 @@
{{if auth == "sqlalchemy"}}
@expose('{{package}}.templates.index')
- @authorize.require(authorize.has_permission('manage'))
+ @require(authorize.has_permission('manage'))
def manage_permission_only(self, **kw):
return dict(page='managers stuff')
@expose('{{package}}.templates.index')
- @authorize.require(authorize.is_user('editor'))
+ @require(authorize.is_user('editor'))
def editor_user_only(self, **kw):
return dict(page='editor stuff')
Modified:
projects/tg.devtools/trunk/devtools/templates/turbogears/+package+/lib/base.py_tmpl
==============================================================================
---
projects/tg.devtools/trunk/devtools/templates/turbogears/+package+/lib/base.py_tmpl
(original)
+++
projects/tg.devtools/trunk/devtools/templates/turbogears/+package+/lib/base.py_tmpl
Sat Nov 22 08:28:03 2008
@@ -55,10 +55,9 @@
def check_security(self):
errors = []
environ = request.environ
- identity = environ.get('repoze.who.identity')
if not hasattr(self, "require") or \
self.require is None or \
- self.require.eval_with_object(identity, errors):
+ self.require.eval_with_environ(environ, errors):
return True
# if we did not return this is an error :)
