fix for requesting of role with construction into manual resource (MI…

…D-7315)
Evolveum · Nov 19, 2021 · 4bb70ce · 4bb70ce
1 parent da2e49c
commit 4bb70ce
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
@@ -300,14 +300,15 @@ private void onSingleUserRequestPerformed(AjaxRequestTarget target) {
             setResponsePage(PageAssignmentShoppingCart.class);
             return;
         }
-        if (!WebComponentUtil.isSuccessOrHandledError(result)) {
-            result.setMessage(createStringResource("PageAssignmentsList.requestError").getString());
-            target.add(getFeedbackPanel());
-            target.add(PageAssignmentsList.this.get(ID_FORM));
-        } else {
+        if (WebComponentUtil.isSuccessOrHandledError(result)
+                || OperationResultStatus.IN_PROGRESS.equals(result.getStatus())) {
             clearStorage();
             result.setMessage(createStringResource("PageAssignmentsList.requestSuccess").getString());
             setResponsePage(PageAssignmentShoppingCart.class);
+        } else {
+            result.setMessage(createStringResource("PageAssignmentsList.requestError").getString());
+            target.add(getFeedbackPanel());
+            target.add(PageAssignmentsList.this.get(ID_FORM));
         }
         showResult(result);
     }

diff --git a/...isioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java b/...isioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java
@@ -22,6 +22,7 @@
 
 import com.evolveum.midpoint.CacheInvalidationContext;
 import com.evolveum.midpoint.common.refinery.RefinedResourceSchemaImpl;
+import com.evolveum.midpoint.provisioning.ucf.api.connectors.AbstractManualConnectorInstance;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.SingleCacheStateInformationType;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
@@ -280,6 +281,10 @@ private void configureConnector(ConnectorInstance connector, ConnectorSpec conne
                 connectorSpec.getConnectorConfiguration().getValue() : null;
         if (connectorConfigurationVal == null) {
             SchemaException e = new SchemaException("No connector configuration in "+connectorSpec);
+            if (connector instanceof AbstractManualConnectorInstance) {
+                result.recordWarning(e);
+                return;
+            }
             result.recordFatalError(e);
             throw e;
         }