Merge remote-tracking branch 'refs/remotes/origin/support-4.4' into s…

…upport-4.4
Evolveum · Jan 25, 2022 · fc7f0e3 · fc7f0e3
2 parents df99773 + fc5dcbf
commit fc7f0e3
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/...om/evolveum/midpoint/gui/impl/page/admin/task/component/TaskInternalPerformancePanel.java b/...om/evolveum/midpoint/gui/impl/page/admin/task/component/TaskInternalPerformancePanel.java
@@ -35,9 +35,7 @@
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Locale;
+import java.util.*;
 
 @PanelType(name = "internalPerformance")
 @PanelInstance(identifier = "internalPerformance", applicableForType = TaskType.class, childOf = TaskPerformancePanel.class,
@@ -59,9 +57,8 @@ public TaskInternalPerformancePanel(String id, TaskDetailsModel taskModel, Conta
     private final IModel<SortBy> sortByModel = Model.of(SortBy.NAME);
 
     protected void initLayout() {
-
         DropDownChoicePanel<Format> formatPanel =
-                WebComponentUtil.createEnumPanel(Format.class, ID_FORMAT, formatModel, this, false);
+                WebComponentUtil.createEnumPanel(Format.class, ID_FORMAT, createFormatListModel(), formatModel, this, false);
         formatPanel.getBaseFormComponent().add(new OnChangeAjaxBehavior() {
             @Override
             protected void onUpdate(AjaxRequestTarget target) {
@@ -97,6 +94,13 @@ public boolean isResizeToMaxHeight() {
 
     }
 
+    private IModel<List<Format>> createFormatListModel() {
+        List<Format> formatList = new ArrayList<>();
+        Collections.addAll(formatList, Format.values());
+        formatList.remove(Format.RAW);
+        return Model.ofList(formatList);
+    }
+
     private IModel<String> createStringModel() {
         return new IModel<>() {
             @Override