Merge remote-tracking branch 'origin/master'

Evolveum · May 3, 2018 · 2353086 · 2353086
2 parents eaeb3d4 + 71d8787
commit 2353086
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCase.java
@@ -21,10 +21,7 @@
 import com.evolveum.midpoint.web.application.PageDescriptor;
 import com.evolveum.midpoint.web.component.AjaxButton;
 import com.evolveum.midpoint.web.component.AjaxSubmitButton;
-import com.evolveum.midpoint.web.component.prism.ContainerStatus;
-import com.evolveum.midpoint.web.component.prism.ObjectWrapper;
-import com.evolveum.midpoint.web.component.prism.ObjectWrapperFactory;
-import com.evolveum.midpoint.web.component.prism.PrismPanel;
+import com.evolveum.midpoint.web.component.prism.*;
 import com.evolveum.midpoint.web.model.ContainerWrapperListFromObjectWrapperModel;
 import com.evolveum.midpoint.web.resource.img.ImgResources;
 import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
@@ -143,6 +140,18 @@ private ObjectWrapper<CaseType> loadCase() {
 
         wrapper.setShowEmpty(emptyCase);
 
+        //for now decided to make targetRef readonly
+        wrapper.getContainers().forEach(containerWrapper -> {
+            if (containerWrapper.isMain()){
+                containerWrapper.getValues().forEach(containerValueWrapper -> {
+                    PropertyOrReferenceWrapper itemWrapper = containerValueWrapper.findPropertyWrapper(CaseType.F_TARGET_REF);
+                    if (itemWrapper != null){
+                        itemWrapper.setReadonly(true);
+                    }
+                });
+            }
+        });
+
         return wrapper;
     }
 

diff --git a/...l-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdUtil.java b/...l-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdUtil.java
@@ -241,7 +241,7 @@ static Throwable processConnIdException(Throwable connIdException, String desc,
 			return newEx;
 		}
 
-        LOGGER.error("FALLBACK: {} -> {}", connIdException.getClass().getName(), knownCause.getClass().getName());
+		LOGGER.error("FALLBACK: {} -> {}", connIdException.getClass().getName(), (knownCause != null ? knownCause.getClass().getName() : null));
 
 		// Fallback
 		Exception newEx = new GenericFrameworkException(createMessageFromAllExceptions(null,connIdException));