From f97959ace4f52abde4c1701d6b22da8ad967c4e7 Mon Sep 17 00:00:00 2001 From: Katarina Valalikova Date: Wed, 25 Mar 2020 14:39:32 +0100 Subject: [PATCH 1/2] making some of the task attributes non mandatory + doc updates. --- .../resources/xml/ns/public/common/common-core-3.xsd | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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 index 39d678c80f4..240d7bd464c 100755 --- 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 @@ -2592,12 +2592,13 @@ - + The user that owns this task. It usually means the user that started the task or a system user that is used to execute the task. The owner will be used to - determine access rights of the task, will be used for auditing, etc. + determine access rights of the task, will be used for auditing, etc. If owner + isn't set, currently logged in user is used. tns:UserType @@ -2647,7 +2648,7 @@ - + Execution status provides information about the task overall high-level execution state. @@ -2888,11 +2889,12 @@ - + Whether the task activity is to be executed only once (single-run tasks) - or periodically (recurring tasks). + or periodically (recurring tasks). If nothing set explicitly, single-run + task is created. From d1740c20e07fa1051a83a11ba67ee0ca5cd20cd4 Mon Sep 17 00:00:00 2001 From: kate Date: Wed, 25 Mar 2020 15:07:59 +0100 Subject: [PATCH 2/2] task page cleanup buttons styles --- .../midpoint/gui/api/GuiStyleConstants.java | 2 ++ .../web/page/admin/server/PageTask.java | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java index 89e93703589..02b3624fafa 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java @@ -218,6 +218,8 @@ public class GuiStyleConstants { public static final String CLASS_ICON_TEXT = "fa fa-text-width"; public static final String CLASS_ICON_TRASH = "fa fa-trash-o"; + public static final String CLASS_ICON_PERFORMANCE = "fa fa-area-chart"; + public static final String CLASS_ICON_TASK_RESULTS = "fa fa-list-alt"; } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask.java index c946d671515..63bac5bc717 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTask.java @@ -4,6 +4,11 @@ import java.util.Collection; import java.util.Collections; +import com.evolveum.midpoint.gui.impl.component.AjaxCompositedIconButton; +import com.evolveum.midpoint.gui.impl.component.data.column.CompositedIconPanel; +import com.evolveum.midpoint.gui.impl.component.icon.CompositedIcon; +import com.evolveum.midpoint.gui.impl.component.icon.CompositedIconBuilder; +import com.evolveum.midpoint.gui.impl.component.icon.IconCssStyle; import com.evolveum.midpoint.gui.impl.prism.PrismPropertyValueWrapper; import com.evolveum.midpoint.gui.impl.prism.PrismReferenceValueWrapperImpl; import com.evolveum.midpoint.gui.impl.prism.PrismReferenceWrapper; @@ -344,7 +349,7 @@ public void onClick(AjaxRequestTarget target) { } private void createCleanupPerformanceButton(RepeatingView repeatingView) { - AjaxIconButton cleanupPerformance = new AjaxIconButton(repeatingView.newChildId(), new Model<>(GuiStyleConstants.CLASS_ICON_TRASH), + AjaxCompositedIconButton cleanupPerformance = new AjaxCompositedIconButton(repeatingView.newChildId(), getTaskCleanupCompositedIcon(GuiStyleConstants.CLASS_ICON_PERFORMANCE), createStringResource("operationalButtonsPanel.cleanupEnvironmentalPerformance")) { @Override @@ -364,7 +369,7 @@ public void onClick(AjaxRequestTarget target) { } private void createCleanupResultsButton(RepeatingView repeatingView) { - AjaxIconButton cleanupResults = new AjaxIconButton(repeatingView.newChildId(), new Model<>(GuiStyleConstants.CLASS_ICON_TRASH), + AjaxCompositedIconButton cleanupResults = new AjaxCompositedIconButton(repeatingView.newChildId(), getTaskCleanupCompositedIcon(GuiStyleConstants.CLASS_ICON_TASK_RESULTS), createStringResource("operationalButtonsPanel.cleanupResults")) { @Override @@ -416,6 +421,15 @@ private void saveTaskChanges(AjaxRequestTarget target, ObjectDelta tas afterOperation(target, result); } + private CompositedIcon getTaskCleanupCompositedIcon(String basicIconClass){ + CompositedIconBuilder iconBuilder = new CompositedIconBuilder(); + CompositedIcon icon = iconBuilder + .setBasicIcon(basicIconClass, IconCssStyle.IN_ROW_STYLE) + .appendLayerIcon(WebComponentUtil.createIconType(GuiStyleConstants.CLASS_ICON_TRASH), IconCssStyle.BOTTOM_RIGHT_STYLE) + .build(); + return icon; + } + private void afterOperation(AjaxRequestTarget target, OperationResult result) { showResult(result); getObjectModel().reset();