Merge branch 'master' into feature/query-component

Evolveum · Mar 13, 2024 · 60aec2b · 60aec2b
2 parents 3960e70 + 3c635af
commit 60aec2b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/...a/com/evolveum/midpoint/gui/impl/factory/wrapper/HeterogenousContainerWrapperFactory.java b/...a/com/evolveum/midpoint/gui/impl/factory/wrapper/HeterogenousContainerWrapperFactory.java
@@ -58,7 +58,8 @@ private boolean filterDefinitins(PrismContainerValue<C> value, ItemDefinition<?>
     public boolean match(ItemDefinition<?> itemDef) {
         if (itemDef.getTypeClass() != null
                 && (itemDef.getTypeClass().isAssignableFrom(CompositeCorrelatorType.class)
-                || itemDef.getTypeClass().isAssignableFrom(SecretsProvidersType.class))) {
+                || itemDef.getTypeClass().isAssignableFrom(SecretsProvidersType.class)
+                || itemDef.getTypeClass().isAssignableFrom(SchemaHandlingType.class))) {
             return false;
         }
 

diff --git a/...src/main/java/com/evolveum/midpoint/web/component/query/SwitchablePropertyValuePanel.html b/...src/main/java/com/evolveum/midpoint/web/component/query/SwitchablePropertyValuePanel.html
@@ -10,10 +10,10 @@
 <body>
 <wicket:panel>
     <div class="row" wicket:id="propertyValuePanel">
-        <div wicket:id="valueField" class="col-xs-11" />
-        <div wicket:id="expressionField" class="col-xs-11" />
-        <button wicket:id="switchButton" class="btn switch-button col-xs-1" trigger="hover">
-            <i class="fa fa-share-square-o"></i>
+        <div wicket:id="valueField" class="col-md-10" />
+        <div wicket:id="expressionField" class="col-md-10" />
+        <button wicket:id="switchButton" class="btn switch-button col-md-2" trigger="hover">
+            <i class="fa fa-share"></i>
         </button>
     </div>
 </wicket:panel>