From 9a1e33696a744527a18dbec667140edb4038ac94 Mon Sep 17 00:00:00 2001 From: burnettk Date: Fri, 21 Oct 2022 17:51:39 -0400 Subject: [PATCH] Squashed 'spiffworkflow-backend/' changes from e013fc5da..13855180b 13855180b upgrade keycloak 952927d41 pyl w/ burnettk git-subtree-dir: spiffworkflow-backend git-subtree-split: 13855180b203282c6fe8a71e0baf650136e3781b --- bin/start_keycloak | 2 +- .../config/permissions/demo.yml | 50 +++++++++++++++++-- .../services/process_instance_processor.py | 2 +- 3 files changed, 49 insertions(+), 5 deletions(-) diff --git a/bin/start_keycloak b/bin/start_keycloak index 4fcaedf8..e1531564 100755 --- a/bin/start_keycloak +++ b/bin/start_keycloak @@ -19,7 +19,7 @@ docker run \ -e KEYCLOAK_LOGLEVEL=ALL \ -e ROOT_LOGLEVEL=ALL \ -e KEYCLOAK_ADMIN=admin \ - -e KEYCLOAK_ADMIN_PASSWORD=admin quay.io/keycloak/keycloak:18.0.2 start-dev \ + -e KEYCLOAK_ADMIN_PASSWORD=admin quay.io/keycloak/keycloak:19.0.3 start-dev \ -Dkeycloak.profile.feature.token_exchange=enabled \ -Dkeycloak.profile.feature.admin_fine_grained_authz=enabled diff --git a/src/spiffworkflow_backend/config/permissions/demo.yml b/src/spiffworkflow_backend/config/permissions/demo.yml index 73ccfc6c..590d711f 100644 --- a/src/spiffworkflow_backend/config/permissions/demo.yml +++ b/src/spiffworkflow_backend/config/permissions/demo.yml @@ -3,13 +3,57 @@ default_group: everybody groups: admin: users: - [jakub, kb, alex, dan, mike, jason, amir, jarrad, elizabeth, jon, natalia, harmeet, sasha, manuchehr] + [ + jakub, + kb, + alex, + dan, + mike, + jason, + amir, + jarrad, + elizabeth, + jon, + natalia, + harmeet, + sasha, + manuchehr, + ] Finance Team: - users: [jakub, alex, dan, mike, jason, amir, jarrad, elizabeth, jon, natalia, harmeet, sasha, manuchehr] + users: + [ + jakub, + alex, + dan, + mike, + jason, + amir, + jarrad, + elizabeth, + jon, + natalia, + harmeet, + sasha, + manuchehr, + ] Team Lead: - users: [jakub, alex, dan, mike, jason, jarrad, elizabeth, jon, natalia, harmeet, sasha, manuchehr] + users: + [ + jakub, + alex, + dan, + mike, + jason, + jarrad, + elizabeth, + jon, + natalia, + harmeet, + sasha, + manuchehr, + ] hr: users: [manuchehr] diff --git a/src/spiffworkflow_backend/services/process_instance_processor.py b/src/spiffworkflow_backend/services/process_instance_processor.py index 2aca1ac6..70c38dba 100644 --- a/src/spiffworkflow_backend/services/process_instance_processor.py +++ b/src/spiffworkflow_backend/services/process_instance_processor.py @@ -534,7 +534,7 @@ class ProcessInstanceProcessor: if not self.bpmn_process_instance._is_engine_task(task_spec): ready_or_waiting_task.data["current_user"]["id"] task_lane = "process_initiator" - if task_spec.lane is not None: + if task_spec.lane is not None and task_spec.lane != "": task_lane = task_spec.lane potential_owner_ids = []