sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2024-12-25 02:44:18 +00:00
Code Issues Projects Releases Wiki Activity

Add creation_data to corpus.

Browse Source
This commit is contained in:
Patrick Jentsch 2019-08-06 15:39:09 +02:00
parent 32c6b9ab8a
commit 65becc1187
3 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/main/views.py
View File

@ -7,7 +7,6 @@ from . import main
from .forms import CreateCorpusForm from .forms import CreateCorpusForm
from ..decorators import admin_required from ..decorators import admin_required
from .. import db from .. import db
import hashlib
import os import os
@ -28,14 +27,11 @@ def dashboard():
if create_corpus_form.validate_on_submit(): if create_corpus_form.validate_on_submit():
app = current_app._get_current_object() app = current_app._get_current_object()
corpus = {'description': create_corpus_form.description.data, corpus = Corpus()
'id': id, corpus.creation_date = datetime.utcnow()
'creator': current_user.id, corpus.description = create_corpus_form.description.data,
'title': create_corpus_form.title.data corpus.title = create_corpus_form.title.data,
} corpus.user_id = current_user.id
corpus = Corpus(description=create_corpus_form.description.data,
title=create_corpus_form.title.data,
user_id=current_user.id)
db.session.add(corpus) db.session.add(corpus)
db.session.commit() db.session.commit()
dir = os.path.join(app.config['OPAQUE_STORAGE'], dir = os.path.join(app.config['OPAQUE_STORAGE'],

3
app/models.py
View File

@ -107,9 +107,9 @@ class User(UserMixin, db.Model):
# Primary key # Primary key
id = db.Column(db.Integer, primary_key=True) id = db.Column(db.Integer, primary_key=True)
confirmed = db.Column(db.Boolean, default=False) confirmed = db.Column(db.Boolean, default=False)
registration_date = db.Column(db.DateTime(), default=datetime.utcnow)
email = db.Column(db.String(64), unique=True, index=True) email = db.Column(db.String(64), unique=True, index=True)
password_hash = db.Column(db.String(128)) password_hash = db.Column(db.String(128))
registration_date = db.Column(db.DateTime(), default=datetime.utcnow)
role_id = db.Column(db.Integer, db.ForeignKey('roles.id')) role_id = db.Column(db.Integer, db.ForeignKey('roles.id'))
username = db.Column(db.String(64), unique=True, index=True) username = db.Column(db.String(64), unique=True, index=True)
# Relationships # Relationships
@ -259,6 +259,7 @@ class Corpus(db.Model):
__tablename__ = 'corpora' __tablename__ = 'corpora'
# Primary key # Primary key
id = db.Column(db.Integer, primary_key=True) id = db.Column(db.Integer, primary_key=True)
creation_data = db.Column(db.DateTime(), default=datetime.utcnow)
description = db.Column(db.String(64)) description = db.Column(db.String(64))
title = db.Column(db.String(32)) title = db.Column(db.String(32))
user_id = db.Column(db.Integer, db.ForeignKey('users.id')) user_id = db.Column(db.Integer, db.ForeignKey('users.id'))

28
migrations/versions/c425353fb4dc_add_creation_data_to_corpus.py Normal file
View File

@ -0,0 +1,28 @@
"""Add creation_data to corpus
Revision ID: c425353fb4dc
Revises: 3f2aee5e6a45
Create Date: 2019-08-06 15:38:33.930052
"""
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision = 'c425353fb4dc'
down_revision = '3f2aee5e6a45'
branch_labels = None
depends_on = None
def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.add_column('corpora', sa.Column('creation_data', sa.DateTime(), nullable=True))
# ### end Alembic commands ###
def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_column('corpora', 'creation_data')
# ### end Alembic commands ###