Infrastructure/fedora-infrastructure
1
0
Fork 0
Code Issues 70 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh://git.fedorahosted.org/git/fedora-infrastructure

Browse source
This commit is contained in:
Ricky Zhou (周家杰) 2008-03-04 18:32:20 -05:00
commit eaeecefc84
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
fas/dev.cfg
View file

@ -7,7 +7,6 @@
#mail.server = 'bastion.fedora.phx.redhat.com' #mail.server = 'bastion.fedora.phx.redhat.com'
#base_url_filter.base_url = "http://192.168.2.101:8080" #base_url_filter.base_url = "http://192.168.2.101:8080"
fas.url = 'http://localhost:8088/fas/'
mail.on = True mail.on = True
mail.server = 'bastion.fedora.phx.redhat.com' mail.server = 'bastion.fedora.phx.redhat.com'
mail.testmode = True mail.testmode = True
@ -53,9 +52,9 @@ autoreload.package="fas"
# unexpected parameter. False by default # unexpected parameter. False by default
tg.strict_parameters = True tg.strict_parameters = True
server.webpath='/fas' server.webpath='/accounts'
base_url_filter.on=True 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 # Make the session cookie only return to the host over an SSL link
# Disabled for testing. # Disabled for testing.

7
fas/fas/controllers.py
View file

@ -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()