Use a boolean instead of a timestamp

flaskbb/user/models.py

@@ -94,7 +94,7 @@ class User(db.Model, UserMixin, CRUDMixin):
 
     last_failed_login = db.Column(db.DateTime)
     login_attempts = db.Column(db.Integer, default=0)
-    activated = db.Column(db.DateTime)
+    activated = db.Column(db.Boolean, default=False)
 
     theme = db.Column(db.String(15))
     language = db.Column(db.String(15), default="en")
@@ -133,7 +133,7 @@ class User(db.Model, UserMixin, CRUDMixin):
         state of the account, either return ``True`` or ``False``.
         """
         if flaskbb_config["ACTIVATE_ACCOUNT"]:
-            if self.activated is not None:
+            if self.activated:
                 return True
             return False
 

flaskbb/utils/populate.py

@@ -176,7 +176,7 @@ def create_admin_user(username, password, email):
     user.password = password
     user.email = email
     user.primary_group_id = admin_group.id
-    user.activated = datetime.utcnow()
+    user.activated = True
 
     user.save()
     return user
@@ -234,7 +234,7 @@ def create_test_data(users=5, categories=2, forums=2, topics=1, posts=1):
         email = "test%s@example.org" % u
         user = User(username=username, password="test", email=email)
         user.primary_group_id = u
-        user.activated = datetime.utcnow()
+        user.activated = True
         user.save()
         data_created['users'] += 1
 

migrations/versions/0ece7c8bfb07_add_account_activation_timestamp.py → migrations/versions/94b3d7958114_add_account_active_state.py

@@ -1,13 +1,13 @@
-"""Add account activation timestamp
+"""Add account active state
 
-Revision ID: 0ece7c8bfb07
+Revision ID: 94b3d7958114
 Revises: 10879048c708
-Create Date: 2016-04-25 22:38:44.504224
+Create Date: 2016-04-29 20:40:26.762939
 
 """
 
 # revision identifiers, used by Alembic.
-revision = '0ece7c8bfb07'
+revision = '94b3d7958114'
 down_revision = '10879048c708'
 
 from alembic import op
@@ -16,7 +16,7 @@ import sqlalchemy as sa
 
 def upgrade():
     ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('users', sa.Column('activated', sa.DateTime(), nullable=True))
+    op.add_column('users', sa.Column('activated', sa.Boolean(), nullable=True))
     ### end Alembic commands ###
 
 

tests/fixtures/user.py

@@ -14,7 +14,7 @@ def user(default_groups):
     """Creates a user with normal permissions."""
     user = User(username="test_normal", email="test_normal@example.org",
                 password="test", primary_group=default_groups[3],
-                activated=datetime.datetime.utcnow())
+                activated=True)
     user.save()
     return user
 
@@ -25,7 +25,7 @@ def moderator_user(user, forum, default_groups):
 
     user = User(username="test_mod", email="test_mod@example.org",
                 password="test", primary_group=default_groups[2],
-                activated=datetime.datetime.utcnow())
+                activated=True)
     user.save()
 
     forum.moderators.append(user)
@@ -38,7 +38,7 @@ def admin_user(default_groups):
     """Creates a admin user."""
     user = User(username="test_admin", email="test_admin@example.org",
                 password="test", primary_group=default_groups[0],
-                activated=datetime.datetime.utcnow())
+                activated=True)
     user.save()
     return user
 
@@ -48,7 +48,7 @@ def super_moderator_user(default_groups):
     """Creates a super moderator user."""
     user = User(username="test_super_mod", email="test_super@example.org",
                 password="test", primary_group=default_groups[1],
-                activated=datetime.datetime.utcnow())
+                activated=True)
     user.save()
     return user