Fixed story sample + minor GUI 'null' issue

Evolveum · Mar 2, 2017 · 1226980 · 1226980
1 parent 650afd6
commit 1226980
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -280,13 +280,17 @@ public static String getTypeLocalized(ObjectReferenceType ref) {
 
 	public static String getReferencedObjectNames(List<ObjectReferenceType> refs, boolean showTypes) {
 		return refs.stream()
-				.map(ref -> getName(ref) + (showTypes ? (" (" + getTypeLocalized(ref) + ")") : ""))
+				.map(ref -> emptyIfNull(getName(ref)) + (showTypes ? (" (" + emptyIfNull(getTypeLocalized(ref)) + ")") : ""))
 				.collect(Collectors.joining(", "));
 	}
 
+	private static String emptyIfNull(String s) {
+		return s != null ? s : "";
+	}
+
 	public static String getReferencedObjectDisplayNamesAndNames(List<ObjectReferenceType> refs, boolean showTypes) {
 		return refs.stream()
-				.map(ref -> getDisplayNameAndName(ref) + (showTypes ? (" (" + getTypeLocalized(ref) + ")") : ""))
+				.map(ref -> emptyIfNull(getDisplayNameAndName(ref)) + (showTypes ? (" (" + emptyIfNull(getTypeLocalized(ref)) + ")") : ""))
 				.collect(Collectors.joining(", "));
 	}
 

diff --git a/testing/story/src/test/resources/strings/roles/global-policy-rules.xml b/testing/story/src/test/resources/strings/roles/global-policy-rules.xml
@@ -46,6 +46,7 @@
 							<resolutionTime>run</resolutionTime>
 						</approverRef>
 						<evaluationStrategy>firstDecides</evaluationStrategy>
+						<groupExpansion>onWorkItemCreation</groupExpansion>
 					</level>
 				</approvalSchema>
 			</approval>