diff --git a/app/models.py b/app/models.py index 261a457b..4a4a1809 100644 --- a/app/models.py +++ b/app/models.py @@ -99,9 +99,6 @@ class User(db.Model, ModelMixin, UserMixin): profile_picture_id = db.Column(db.ForeignKey(File.id), nullable=True) # feature flag - can_use_api_key = db.Column( - db.Boolean, nullable=False, default=False, server_default="0" - ) can_use_custom_domain = db.Column( db.Boolean, nullable=False, default=False, server_default="0" ) diff --git a/migrations/versions/3a87573bf8a8_.py b/migrations/versions/3a87573bf8a8_.py new file mode 100644 index 00000000..afcc4d14 --- /dev/null +++ b/migrations/versions/3a87573bf8a8_.py @@ -0,0 +1,29 @@ +"""empty message + +Revision ID: 3a87573bf8a8 +Revises: e83298198ca5 +Create Date: 2019-11-29 18:53:24.553859 + +""" +import sqlalchemy_utils +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '3a87573bf8a8' +down_revision = 'e83298198ca5' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('users', 'can_use_api_key') + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.add_column('users', sa.Column('can_use_api_key', sa.BOOLEAN(), server_default=sa.text('false'), autoincrement=False, nullable=False)) + # ### end Alembic commands ### diff --git a/server.py b/server.py index dc8846f9..df4951be 100644 --- a/server.py +++ b/server.py @@ -103,7 +103,6 @@ def fake_data(): password="password", activated=True, is_admin=True, - can_use_api_key=True, ) db.session.commit() diff --git a/templates/header.html b/templates/header.html index 06c43a58..9d35ac49 100644 --- a/templates/header.html +++ b/templates/header.html @@ -46,11 +46,9 @@ Settings - {% if current_user.can_use_api_key %} - - API Key - - {% endif %} + + API Key + {% if current_user.is_premium() %}