MID-8650:fix for reclassify button (define only object class for crea…

…ted import task)
Evolveum · Apr 5, 2023 · d00ca10 · d00ca10
1 parent b2fdb03
commit d00ca10
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 30 deletions.
diff --git a/...va/com/evolveum/midpoint/gui/impl/page/admin/resource/component/ResourceContentPanel.java b/...va/com/evolveum/midpoint/gui/impl/page/admin/resource/component/ResourceContentPanel.java
@@ -826,46 +826,31 @@ private void createReclassifyTask(AjaxRequestTarget target) {
                     .beginConfigurationToUse()
                     .predefined(PredefinedConfigurationType.DEVELOPMENT);
 
-            ShadowKindType kind = null;
-            String intent = null;
             QName objectClass = null;
 
             IModel<PrismContainerValueWrapper<ResourceObjectTypeDefinitionType>> model = getResourceObjectTypeValue(null);
             if (model != null) {
                 ResourceObjectTypeDefinitionType objectType = model.getObject().getRealValue();
-                kind = objectType.getKind();
-                intent = objectType.getIntent();
-                objectClass = objectType.getObjectClass();
+                if (objectType.getDelineation() != null) {
+                    objectClass = objectType.getDelineation().getObjectClass();
+                }
+                if (objectClass == null) {
+                    objectClass = objectType.getObjectClass();
+                }
             }
             QName searchObjectClass = getObjectClass();
             if (searchObjectClass != null) {
                 objectClass = searchObjectClass;
             }
 
-            if (kind != null) {
-                task.getUpdatedTaskObject().getRealValue()
-                        .getActivity()
-                        .getWork()
-                        .getImport()
-                        .getResourceObjects()
-                        .kind(kind);
-
-                if (StringUtils.isNotEmpty(intent)) {
-                    task.getUpdatedTaskObject().getRealValue()
-                            .getActivity()
-                            .getWork()
-                            .getImport()
-                            .getResourceObjects()
-                            .intent(intent);
-                }
-            } else {
-                task.getUpdatedTaskObject().getRealValue()
-                        .getActivity()
-                        .getWork()
-                        .getImport()
-                        .getResourceObjects()
-                        .objectclass(objectClass);
-            }
+            task.getUpdatedTaskObject().getRealValue()
+                    .getActivity()
+                    .getWork()
+                    .getImport()
+                    .getResourceObjects()
+                    .objectclass(objectClass)
+                    .intent(null)
+                    .kind(null);
 
             task.makeSingle();
 

diff --git a/...e/admin/resource/component/wizard/objectType/attributeMapping/AttributeMappingsTable.java b/...e/admin/resource/component/wizard/objectType/attributeMapping/AttributeMappingsTable.java
@@ -279,7 +279,7 @@ public void onClick(AjaxRequestTarget target) {
                 newItemPerformed(target, null);
             }
         };
-        newObjectSimpleButton.add(AttributeAppender.append("class", "btn btn-default btn-sm ml-3"));
+        newObjectSimpleButton.add(AttributeAppender.append("class", "btn btn-primary btn-sm ml-3"));
         newObjectSimpleButton.add(new VisibleBehaviour(this::isCreateNewObjectSimpleVisible));
         newObjectSimpleButton.showTitleAsLabel(true);
         buttons.add(newObjectSimpleButton);