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

Evolveum · Mar 29, 2023 · 2243f1d · 2243f1d
2 parents 9ab398d + 11a6c6b
commit 2243f1d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
@@ -677,7 +677,10 @@ protected void updateDefinitions() {
         } else {
             objectClass = objectClassDef.getTypeName();
             if (getIntent() == null) {
-                intent = ((ResourceObjectTypeDefinitionImpl) objectClassDef).getIntent();
+                ResourceObjectTypeDefinition typeDefinition = objectClassDef.getTypeDefinition();
+                if (typeDefinition != null) {
+                    intent = typeDefinition.getIntent();
+                }
             }
         }
     }

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
@@ -15081,15 +15081,12 @@
                         triggered. If the situation is not explicitly stated then
                         default situation will be selected instead. The situation
                         is determined by the constraint that triggered the rule.
-                        DEPRECATED. Use markRef instead.
 
-                        TODO specify the time of planned removal
+                        Will be eventually replaced by markRef.
                     </xsd:documentation>
                     <xsd:appinfo>
                         <a:displayName>PolicyRuleType.policySituation</a:displayName>
                         <a:help>PolicyRuleType.policySituation.help</a:help>
-                        <a:deprecated>true</a:deprecated>
-                        <a:deprecatedSince>4.7</a:deprecatedSince>
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-security-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-security-3.xsd
@@ -173,7 +173,7 @@
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:sequence>
-            <xsd:element name="name" type="xsd:string" >
+            <xsd:element name="name" type="xsd:string" minOccurs="0">
                 <xsd:annotation>
                     <xsd:documentation>
                         Unique name of the authentication module. This name is fact a short identifier.