Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Nov 13, 2018 · 63516fa · 63516fa
2 parents 1376c75 + 3361292
commit 63516fa
Showing 1 changed file with 28 additions and 29 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
@@ -619,13 +619,7 @@ public void setObject(String object) {
 				if (def.getValueEnumerationRef() != null) {
 					PrismReferenceValue valueEnumerationRef = def.getValueEnumerationRef();
 					String lookupTableUid = valueEnumerationRef.getOid();
-					Task task = getPageBase().createSimpleTask("loadLookupTable");
-					OperationResult result = task.getResult();
-
-					Collection<SelectorOptions<GetOperationOptions>> options = WebModelServiceUtils
-							.createLookupTableRetrieveOptions();
-					final PrismObject<LookupTableType> lookupTable = WebModelServiceUtils.loadObject(LookupTableType.class,
-							lookupTableUid, options, getPageBase(), task, result);
+					PrismObject<LookupTableType> lookupTable = getLookupTable(lookupTableUid);
 
 					if (lookupTable != null) {
 
@@ -899,28 +893,7 @@ public void checkInputValue(AutoCompleteTextField input, AjaxRequestTarget targe
 				} else if (def.getValueEnumerationRef() != null) {
 					PrismReferenceValue valueEnumerationRef = def.getValueEnumerationRef();
 					String lookupTableUid = valueEnumerationRef.getOid();
-
-					PrismObject<LookupTableType> lookupTable;
-					String operation = "loadLookupTable";
-					if(getPageBase() instanceof PageSelfRegistration) {
-						lookupTable = getPageBase().runPrivileged(
-								() -> {
-									Task task = getPageBase().createAnonymousTask(operation);
-									OperationResult result = task.getResult();
-									Collection<SelectorOptions<GetOperationOptions>> options = WebModelServiceUtils
-											.createLookupTableRetrieveOptions();
-									return WebModelServiceUtils.loadObject(LookupTableType.class,
-											lookupTableUid, options, getPageBase(), task, result);
-								});
-					} else {
-						Task task = getPageBase().createSimpleTask(operation);
-						OperationResult result = task.getResult();
-
-						Collection<SelectorOptions<GetOperationOptions>> options = WebModelServiceUtils
-								.createLookupTableRetrieveOptions();
-						lookupTable = WebModelServiceUtils.loadObject(LookupTableType.class,
-								lookupTableUid, options, getPageBase(), task, result);
-					}
+					PrismObject<LookupTableType> lookupTable = getLookupTable(lookupTableUid);
 
 					if (lookupTable != null) {
 
@@ -995,6 +968,32 @@ protected Class getDefaultType(List<QName> supportedTypes){
 
 		return panel;
 	}
+
+	private PrismObject<LookupTableType> getLookupTable(String lookupTableUid) {
+		PrismObject<LookupTableType> lookupTable;
+		String operation = "loadLookupTable";
+		if(getPageBase() instanceof PageSelfRegistration) {
+			lookupTable = getPageBase().runPrivileged(
+					() -> {
+						Task task = getPageBase().createAnonymousTask(operation);
+						OperationResult result = task.getResult();
+						Collection<SelectorOptions<GetOperationOptions>> options = WebModelServiceUtils
+								.createLookupTableRetrieveOptions();
+						return WebModelServiceUtils.loadObject(LookupTableType.class,
+								lookupTableUid, options, getPageBase(), task, result);
+					});
+		} else {
+			Task task = getPageBase().createSimpleTask(operation);
+			OperationResult result = task.getResult();
+
+			Collection<SelectorOptions<GetOperationOptions>> options = WebModelServiceUtils
+					.createLookupTableRetrieveOptions();
+			lookupTable = WebModelServiceUtils.loadObject(LookupTableType.class,
+					lookupTableUid, options, getPageBase(), task, result);
+		}
+
+		return lookupTable;
+	}
 
 	private List<String> prepareAutoCompleteList(String input, PrismObject<LookupTableType> lookupTable) {
 		List<String> values = new ArrayList<>();