diff --git a/fas/dev.cfg b/fas/dev.cfg index e266447..5363558 100644 --- a/fas/dev.cfg +++ b/fas/dev.cfg @@ -7,7 +7,6 @@ #mail.server = 'bastion.fedora.phx.redhat.com' #base_url_filter.base_url = "http://192.168.2.101:8080" -fas.url = 'http://localhost:8088/fas/' mail.on = True mail.server = 'bastion.fedora.phx.redhat.com' mail.testmode = True @@ -53,9 +52,9 @@ autoreload.package="fas" # unexpected parameter. False by default tg.strict_parameters = True -server.webpath='/fas' +server.webpath='/accounts' base_url_filter.on=True -base_url_filter.base_url = "http://localhost:8088/fas" +base_url_filter.base_url = "http://localhost:8088/accounts" # Make the session cookie only return to the host over an SSL link # Disabled for testing. diff --git a/fas/fas/controllers.py b/fas/fas/controllers.py index 2aae449..678f9ff 100644 --- a/fas/fas/controllers.py +++ b/fas/fas/controllers.py @@ -63,10 +63,15 @@ class Root(controllers.RootController): @expose(template="fas.templates.welcome", allow_json=True) def index(self): 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') return dict(now=time.ctime()) - @expose(template="fas.templates.home") + @expose(template="fas.templates.home", allow_json=True) @identity.require(identity.not_anonymous()) def home(self): return dict()