sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2024-12-24 10:34:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development

Browse Source
This commit is contained in:
Stephan Porada 2020-01-07 13:03:44 +01:00
commit f189460543
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/jobs/forms.py
View File

@ -22,7 +22,8 @@ class AddNLPJobForm(FlaskForm):
submit = SubmitField()
title = StringField('Title', validators=[DataRequired(), Length(1, 32)])
version = SelectField('Version',
choices=[('2.1.0', 'Latest (2.1.0)'),
choices=[('2.2.0', 'Latest (2.2.0)'),
('2.2.0', '2.2.0'),
('2.1.0', '2.1.0')],
validators=[DataRequired()])

3
config.py
View File

@ -15,6 +15,7 @@ class Config:
MAIL_DEFAULT_SENDER = os.environ.get('MAIL_DEFAULT_SENDER')
''' ### Flask-SQLAlchemy ### '''
SQLALCHEMY_ENGINE_OPTIONS = {'pool_size': 30, 'pool_timeout': 30}
SQLALCHEMY_TRACK_MODIFICATIONS = False
''' ### Opaque ### '''
@ -31,8 +32,6 @@ class DevelopmentConfig(Config):
DEBUG = True
''' ### Flask-SQLAlchemy ### '''
SQLALCHEMY_ENGINE_OPTIONS = {'pool_size': 30,
'pool_timeout': 30}
SQLALCHEMY_DATABASE_URI = 'postgresql://{}:{}@db/{}'.format(
os.environ.get('POSTGRES_USER'),
os.environ.get('POSTGRES_PASSWORD'),