diff --git a/crc/api/study.py b/crc/api/study.py index fbdc96c1..f66c4fd0 100644 --- a/crc/api/study.py +++ b/crc/api/study.py @@ -166,7 +166,9 @@ def get_study_workflows(study_id): # Get study status spec status_spec: WorkflowSpecModel = session.query(WorkflowSpecModel)\ - .filter_by(is_status=True).first() + .filter_by(is_status=True)\ + .filter_by(id=study.status_spec_id)\ + .first() status_data = None diff --git a/crc/api/workflow.py b/crc/api/workflow.py index 16e3e11c..c78d9653 100644 --- a/crc/api/workflow.py +++ b/crc/api/workflow.py @@ -19,7 +19,6 @@ def all_specifications(): @auth.login_required def add_workflow_specification(body): new_spec: WorkflowSpecModel = WorkflowSpecModelSchema().load(body, session=session) - new_spec.is_status = new_spec.id == 'status' session.add(new_spec) session.commit() return WorkflowSpecModelSchema().dump(new_spec) diff --git a/crc/models/workflow.py b/crc/models/workflow.py index 956be5f1..31775882 100644 --- a/crc/models/workflow.py +++ b/crc/models/workflow.py @@ -5,6 +5,7 @@ from marshmallow_sqlalchemy import SQLAlchemyAutoSchema from crc import db + class WorkflowSpecCategoryModel(db.Model): __tablename__ = 'workflow_spec_category' id = db.Column(db.Integer, primary_key=True)