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

Evolveum · Mar 3, 2023 · a3914a0 · a3914a0
2 parents 0877e9a + c01941e
commit a3914a0
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/...i/src/main/java/com/evolveum/midpoint/gui/impl/page/forgotpassword/PageResetPassword.java b/...i/src/main/java/com/evolveum/midpoint/gui/impl/page/forgotpassword/PageResetPassword.java
@@ -7,13 +7,15 @@
 package com.evolveum.midpoint.gui.impl.page.forgotpassword;
 
 import com.evolveum.midpoint.gui.impl.page.login.AbstractPageLogin;
+import com.evolveum.midpoint.gui.impl.page.login.PageLogin;
 import com.evolveum.midpoint.gui.impl.page.self.credentials.ChangePasswordPanel;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 
 import com.evolveum.midpoint.web.component.AjaxButton;
 import com.evolveum.midpoint.web.component.form.MidpointForm;
 
+import org.apache.wicket.RestartResponseException;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 
 import com.evolveum.midpoint.authentication.api.authorization.AuthorizationAction;
@@ -108,7 +110,7 @@ protected void finishChangePassword(final OperationResult result, AjaxRequestTar
 
                     showResult(result);
                     AuthUtil.clearMidpointAuthentication();
-                    setResponsePage(new RedirectPage("/"));
+                    throw new RestartResponseException(PageLogin.class);
                 } else if (showFeedback) {
                     showResult(result);
                 }

diff --git a/...rc/main/java/com/evolveum/midpoint/web/component/input/QNameObjectTypeChoiceRenderer.java b/...rc/main/java/com/evolveum/midpoint/web/component/input/QNameObjectTypeChoiceRenderer.java
@@ -10,6 +10,8 @@
 import java.util.List;
 import javax.xml.namespace.QName;
 
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
+
 import org.apache.wicket.markup.html.form.IChoiceRenderer;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.StringResourceModel;
@@ -26,9 +28,14 @@ public Object getDisplayValue(QName qname) {
         if (qname == null) {
             return null;
         }
-
-        ObjectTypes ot = ObjectTypes.getObjectTypeFromTypeQName(qname);
-        String key = WebComponentUtil.createEnumResourceKey(ot);
+        String key = null;
+        try {
+            ObjectTypes ot = ObjectTypes.getObjectTypeFromTypeQName(qname);
+            key = WebComponentUtil.createEnumResourceKey(ot);
+        } catch (Exception e) {
+            key = ObjectType.class.getSimpleName() + "." + qname.getLocalPart();   //HACK exception occurs during the attempt to find ObjectTypes value for
+                                                                                    // containerable (not objectable) type. therefore generate key in this way
+        }
         return new StringResourceModel(key).setDefaultValue(key).getString();
     }
 

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
@@ -6244,6 +6244,11 @@
                             </xsd:documentation>
                         </xsd:annotation>
                     </xsd:element>
+                    <!--
+                    TODO: Consider renaming, because returnTypeof type QName is used also in expression, which is a mere level above and can be confusing.
+                     Also - this seems to do nothing at the moment, it probably ends in ScriptExpressionEvaluationContext#suggestedReturnType and is not used further.
+                     Related Jira: MID-8552
+                    -->
                     <xsd:element name="returnType" type="tns:ScriptExpressionReturnTypeType" minOccurs="0">
                         <xsd:annotation>
                             <xsd:documentation>
@@ -6253,10 +6258,12 @@
                             </xsd:documentation>
                         </xsd:annotation>
                     </xsd:element>
+                    <!-- TODO: Consider renaming to referenceVariableMode. -->
                     <xsd:element name="objectVariableMode" type="tns:ObjectVariableModeType" minOccurs="0" default="object">
                         <xsd:annotation>
                             <xsd:documentation>
-                                Type of object variables that appear in the script.
+                                Specifies how reference variables should be provided for the script.
+                                By default, they are resolved to objects.
                             </xsd:documentation>
                             <xsd:appinfo>
                                 <a:since>4.0</a:since>
@@ -6343,7 +6350,8 @@
     <xsd:simpleType name="ObjectVariableModeType">
         <xsd:annotation>
             <xsd:documentation>
-                Type of object variables that appear in the script.
+                Specifies how reference variables should be provided for the script.
+                By default, they are resolved to objects.
             </xsd:documentation>
             <xsd:appinfo>
                 <jaxb:typesafeEnumClass/>