sartography
/
spiff-arena
mirror of https://github.com/sartography/spiff-arena.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge commit '127ef67f120ef4035a5f214f6b140488eca60a8d'

This commit is contained in:
jasquat 2022-11-09 17:01:17 -05:00
parent 272594b69a 127ef67f12
commit f4142ba1fb
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spiffworkflow-backend/src/spiffworkflow_backend/models/spiff_step_details.py
View File

@ -14,6 +14,6 @@ class SpiffStepDetailsModel(SpiffworkflowBaseDBModel):
id: int = db.Column(db.Integer, primary_key=True) id: int = db.Column(db.Integer, primary_key=True)
process_instance_id: int = db.Column(db.Integer, nullable=False) process_instance_id: int = db.Column(db.Integer, nullable=False)
spiff_step: int = db.Column(db.Integer, nullable=False) spiff_step: int = db.Column(db.Integer, nullable=False)
task_json: str | None = deferred(db.Column(db.JSON, nullable=False)) # type: ignore task_json: str = deferred(db.Column(db.JSON, nullable=False)) # type: ignore
timestamp: float = db.Column(db.DECIMAL(17, 6), nullable=False) timestamp: float = db.Column(db.DECIMAL(17, 6), nullable=False)
completed_by_user_id: int = db.Column(db.Integer, nullable=True) completed_by_user_id: int = db.Column(db.Integer, nullable=True)

5
spiffworkflow-backend/tests/spiffworkflow_backend/helpers/example_data.py
View File

@ -19,7 +19,6 @@ class ExampleDataLoader:
display_name: str = "", display_name: str = "",
description: str = "", description: str = "",
display_order: int = 0, display_order: int = 0,
# from_tests: bool = False,
bpmn_file_name: Optional[str] = None, bpmn_file_name: Optional[str] = None,
process_model_source_directory: Optional[str] = None, process_model_source_directory: Optional[str] = None,
) -> ProcessModelInfo: ) -> ProcessModelInfo:
@ -58,9 +57,9 @@ class ExampleDataLoader:
if bpmn_file_name: if bpmn_file_name:
file_name_matcher = bpmn_file_name_with_extension file_name_matcher = bpmn_file_name_with_extension
# file_glob = "" # we need instance_path here for nox tests
file_glob = os.path.join( file_glob = os.path.join(
current_app.root_path, current_app.instance_path,
"..", "..",
"..", "..",
"tests", "tests",