diff --git a/application-engine/pom.xml b/application-engine/pom.xml index 002ef02af4..da5d0cd77c 100644 --- a/application-engine/pom.xml +++ b/application-engine/pom.xml @@ -6,7 +6,7 @@ com.netgrif application-engine-parent - 7.0.0-RC8 + 7.0.0-RC8.1 application-engine diff --git a/application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy b/application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy index f0275b57fb..f22cf8983a 100644 --- a/application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy +++ b/application-engine/src/main/groovy/com/netgrif/application/engine/petrinet/domain/dataset/logic/action/ActionDelegate.groovy @@ -2427,14 +2427,11 @@ class ActionDelegate { Map temp = [:] return roles.collectEntries { entry -> if (entry.value == GLOBAL_ROLE) { - Set findGlobalRole = processRoleService.findAllByImportId(ProcessRole.GLOBAL + entry.key) - if (findGlobalRole == null || findGlobalRole.isEmpty()) { - return - } - ProcessRole role = findGlobalRole.find { it.isGlobal() } - if (role == null) { + List roleList = processRoleService.findAllByImportId(ProcessRole.GLOBAL + entry.key, Pageable.ofSize(1)).getContent() + if (roleList.isEmpty()) { return } + ProcessRole role = roleList.getFirst() return [(role.importId + ":" + GLOBAL_ROLE), ("$role.name (🌍 Global role)" as String)] } else { if (!temp.containsKey(entry.value)) { diff --git a/nae-object-library/pom.xml b/nae-object-library/pom.xml index 98ff04ae46..24bf6a0247 100644 --- a/nae-object-library/pom.xml +++ b/nae-object-library/pom.xml @@ -7,7 +7,7 @@ com.netgrif application-engine-parent - 7.0.0-RC8 + 7.0.0-RC8.1 nae-object-library diff --git a/nae-spring-core-adapter/pom.xml b/nae-spring-core-adapter/pom.xml index 0ada0b8973..28d2c15eaa 100644 --- a/nae-spring-core-adapter/pom.xml +++ b/nae-spring-core-adapter/pom.xml @@ -7,7 +7,7 @@ com.netgrif application-engine-parent - 7.0.0-RC8 + 7.0.0-RC8.1 nae-spring-core-adapter diff --git a/nae-user-ce/pom.xml b/nae-user-ce/pom.xml index 749945c1a5..9d2ea018c4 100644 --- a/nae-user-ce/pom.xml +++ b/nae-user-ce/pom.xml @@ -6,7 +6,7 @@ com.netgrif application-engine-parent - 7.0.0-RC8 + 7.0.0-RC8.1 nae-user-ce diff --git a/nae-user-common/pom.xml b/nae-user-common/pom.xml index 1c4f6055da..c19da92f83 100644 --- a/nae-user-common/pom.xml +++ b/nae-user-common/pom.xml @@ -6,7 +6,7 @@ com.netgrif application-engine-parent - 7.0.0-RC8 + 7.0.0-RC8.1 nae-user-common diff --git a/pom.xml b/pom.xml index c889ea0356..8d9e904ec8 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.netgrif application-engine-parent - 7.0.0-RC8 + 7.0.0-RC8.1 pom NETGRIF Application Engine parent