event logging fixes, one in spiff and one in backend

This commit is contained in:
burnettk 2022-10-03 18:25:43 -04:00
parent 8160c597a2
commit 7c3488fd6c
3 changed files with 7 additions and 5 deletions

6
poetry.lock generated
View File

@ -1843,8 +1843,8 @@ pytz = "*"
[package.source] [package.source]
type = "git" type = "git"
url = "https://github.com/sartography/SpiffWorkflow" url = "https://github.com/sartography/SpiffWorkflow"
reference = "main" reference = "feature/get-description-when-parsing-service-task"
resolved_reference = "e97c50744bb1bcf276eef04ba159b80ac5860651" resolved_reference = "e6d8478bcaf19ad90c13dc0a250513a6bfa90760"
[[package]] [[package]]
name = "SQLAlchemy" name = "SQLAlchemy"
@ -2156,7 +2156,7 @@ testing = ["func-timeout", "jaraco.itertools", "pytest (>=6)", "pytest-black (>=
[metadata] [metadata]
lock-version = "1.1" lock-version = "1.1"
python-versions = "^3.9" python-versions = "^3.9"
content-hash = "7a3c07a2eef00685adbf44b6e26b740e20fc52bf85e916b6c171b13d4fcc6dc9" content-hash = "10b2edb09b9d220cd547527238bb49ff8fe01dd2406e85f0ff6fa2fbc9cca1ce"
[metadata.files] [metadata.files]
alabaster = [ alabaster = [

View File

@ -27,7 +27,9 @@ flask-marshmallow = "*"
flask-migrate = "*" flask-migrate = "*"
flask-restful = "*" flask-restful = "*"
werkzeug = "*" werkzeug = "*"
SpiffWorkflow = {git = "https://github.com/sartography/SpiffWorkflow", rev = "main"} # go back to main once https://github.com/sartography/SpiffWorkflow/pull/241 is merged
SpiffWorkflow = {git = "https://github.com/sartography/SpiffWorkflow", rev = "feature/get-description-when-parsing-service-task"}
# SpiffWorkflow = {develop = true, path = "/Users/kevin/projects/github/sartography/SpiffWorkflow"}
# SpiffWorkflow = {develop = true, path = "/home/jason/projects/github/sartography/SpiffWorkflow"} # SpiffWorkflow = {develop = true, path = "/home/jason/projects/github/sartography/SpiffWorkflow"}
sentry-sdk = "1.9.0" sentry-sdk = "1.9.0"
sphinx-autoapi = "^1.8.4" sphinx-autoapi = "^1.8.4"

View File

@ -404,7 +404,7 @@ def process_instance_log_list(
SpiffLoggingModel.process_instance_id == process_instance.id SpiffLoggingModel.process_instance_id == process_instance.id
) )
.order_by(SpiffLoggingModel.timestamp.desc()) # type: ignore .order_by(SpiffLoggingModel.timestamp.desc()) # type: ignore
.join(UserModel) .join(UserModel, isouter=True) # isouter since if we don't have a user, we still want the log
.add_columns( .add_columns(
UserModel.username, UserModel.username,
) )