Fix the root url to return json data even when we'd normally redirect.
This commit is contained in:
parent
8abb94bfc1
commit
cb97e07a9c
1 changed files with 6 additions and 1 deletions
|
@ -63,10 +63,15 @@ class Root(controllers.RootController):
|
||||||
@expose(template="fas.templates.welcome", allow_json=True)
|
@expose(template="fas.templates.welcome", allow_json=True)
|
||||||
def index(self):
|
def index(self):
|
||||||
if turbogears.identity.not_anonymous():
|
if turbogears.identity.not_anonymous():
|
||||||
|
if 'tg_format' in request.params \
|
||||||
|
and request.params['tg_format'] == 'json':
|
||||||
|
# redirects don't work with JSON calls. This is a bit of a
|
||||||
|
# hack until we can figure out something better.
|
||||||
|
return dict()
|
||||||
turbogears.redirect('/home')
|
turbogears.redirect('/home')
|
||||||
return dict(now=time.ctime())
|
return dict(now=time.ctime())
|
||||||
|
|
||||||
@expose(template="fas.templates.home")
|
@expose(template="fas.templates.home", allow_json=True)
|
||||||
@identity.require(identity.not_anonymous())
|
@identity.require(identity.not_anonymous())
|
||||||
def home(self):
|
def home(self):
|
||||||
return dict()
|
return dict()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue