From 9a079e092f94d80ef5b01c27a7f8f99b008337d5 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 26 Feb 2016 14:24:21 -0600 Subject: [PATCH] fixed typo in auth --- applications/welcome/models/db.py | 6 +++--- gluon/tools.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/applications/welcome/models/db.py b/applications/welcome/models/db.py index 075e7aca..04acf4b3 100644 --- a/applications/welcome/models/db.py +++ b/applications/welcome/models/db.py @@ -35,7 +35,7 @@ else: response.generic_patterns = ['*'] if request.is_local else [] ## choose a style for forms response.formstyle = myconf.get('forms.formstyle') # or 'bootstrap3_stacked' or 'bootstrap2' or other -response.form_label_separator = myconf.get('forms.separator') +response.form_label_separator = myconf.get('forms.separator') or '' ## (optional) optimize handling of static files @@ -67,8 +67,8 @@ mail = auth.settings.mailer mail.settings.server = 'logging' if request.is_local else myconf.get('smtp.server') mail.settings.sender = myconf.get('smtp.sender') mail.settings.login = myconf.get('smtp.login') -mail.settings.tls = myconf.get('smtp.tls') -mail.settings.ssl = myconf.get('smtp.ssl') +mail.settings.tls = myconf.get('smtp.tls') or False +mail.settings.ssl = myconf.get('smtp.ssl') or False ## configure auth policy auth.settings.registration_requires_verification = False diff --git a/gluon/tools.py b/gluon/tools.py index 4a608a05..e0edf878 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -1765,7 +1765,7 @@ class Auth(object): settings = self.settings = Settings() settings.update(Auth.default_settings) - host = host or request.env.http_host, + host = host or request.env.http_host settings.update( cas_domains=[host], enable_tokens=False,