Browse Source

Fix for manage.py production config.
Fix for #220

Denis Nikanorov 8 years ago
parent
commit
129ca33009
2 changed files with 6 additions and 3 deletions
  1. 2 2
      flaskbb/auth/views.py
  2. 4 1
      manage.py

+ 2 - 2
flaskbb/auth/views.py

@@ -260,14 +260,14 @@ def activate_account(token=None):
         return redirect(url_for("auth.request_activation_token"))
 
     if user:
-        user.activated = datetime.utcnow()
+        user.activated = True
         user.save()
 
         if current_user != user:
             logout_user()
             login_user(user)
 
-        flash(_("Your account has been activated.", "success"))
+        flash(_("Your account has been activated."), "success")
         return redirect(url_for("forum.index"))
 
     return render_template("auth/account_activation.html", form=form)

+ 4 - 1
manage.py

@@ -42,7 +42,10 @@ from flaskbb.utils.populate import (create_test_data, create_welcome_forum,
 try:
     from flaskbb.configs.development import DevelopmentConfig as Config
 except ImportError:
-    from flaskbb.configs.default import DefaultConfig as Config
+    try:
+        from flaskbb.configs.production import ProductionConfig as Config
+    except ImportError:
+        from flaskbb.configs.default import DefaultConfig as Config
 
 app = create_app(Config)
 manager = Manager(app)