Merge pull request hack4impact#44 from hack4impact/fix-small-bugs

abhisuri97 · web-flow · commit 0e2728d48948 · 2016-07-14T20:27:24.000-04:00
Fix small bugs
diff --git a/app/__init__.py b/app/__init__.py
@@ -19,7 +19,9 @@
 compress = Compress()
 # Set up Flask-Login
 login_manager = LoginManager()
-login_manager.session_protection = 'strong'
+# TODO: Ideally this should be strong, but that led to bugs. Once this is
+# fixed, switch protection mode back to 'strong'
+login_manager.session_protection = 'basic'
 login_manager.login_view = 'account.login'
 
 
diff --git a/app/templates/account/reset_password.html b/app/templates/account/reset_password.html
@@ -8,4 +8,4 @@ <h2 class="ui dividing header">Reset your password</h2>
             {{ f.render_form(form) }}
         </div>
     </div>
-{% endblock %}
+{% endblock %}
diff --git a/app/templates/macros/form_macros.html b/app/templates/macros/form_macros.html
@@ -30,6 +30,7 @@
         {% for field in form | selectattr('type', 'equalto', 'SubmitField') %}
             {{ render_form_field(field) }}
         {% endfor %}
+
     {{ end_form(form) }}
 {% endmacro %}
 
diff --git a/config.py b/config.py
@@ -9,7 +9,6 @@ class Config:
     SECRET_KEY = os.environ.get('SECRET_KEY') or \
         'SjefBOa$1FgGco0SkfPO392qqH9%a492'
     SQLALCHEMY_COMMIT_ON_TEARDOWN = True
-    SSL_DISABLE = True
 
     MAIL_SERVER = 'smtp.googlemail.com'
     MAIL_PORT = 587
@@ -56,6 +55,7 @@ class TestingConfig(Config):
 class ProductionConfig(Config):
     SQLALCHEMY_DATABASE_URI = os.environ.get('DATABASE_URL') or \
         'sqlite:///' + os.path.join(basedir, 'data.sqlite')
+    SSL_DISABLE = (os.environ.get('SSL_DISABLE') or 'True') == 'True'
 
     @classmethod
     def init_app(cls, app):
@@ -83,8 +83,6 @@ def init_app(cls, app):
 
 
 class HerokuConfig(ProductionConfig):
-    SSL_DISABLE = bool(os.environ.get('SSL_DISABLE'))
-
     @classmethod
     def init_app(cls, app):
         ProductionConfig.init_app(app)
