From bb775fbbba64220da3cdf6e742a5080f46b95168 Mon Sep 17 00:00:00 2001 From: elgekko Date: Tue, 5 Jul 2022 16:14:09 +0200 Subject: [PATCH] Alapertelmezett rendezes az Archivalva --- .../user/jobengine/zk/model/GridSearchModel.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/GridSearchModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/GridSearchModel.java index 2d55d438..d20a1c12 100644 --- a/server/user.mediacube.gui/src/user/jobengine/zk/model/GridSearchModel.java +++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/GridSearchModel.java @@ -16,6 +16,7 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import org.apache.commons.lang.StringUtils; import org.apache.logging.log4j.LogManager; @@ -924,10 +925,16 @@ public class GridSearchModel extends AsyncBaseModel { } private void setColumnOrder() { - if (SessionUtil.getUserColumnOrder() != null) { - columnOrder = new HashMap<>(); - columnOrder.put(SessionUtil.getUserColumnOrder().entrySet().iterator().next().getKey(), - (String) SessionUtil.getUserColumnOrder().entrySet().iterator().next().getValue()); + Map userColumnOrder = SessionUtil.getUserColumnOrder(); + columnOrder = new HashMap<>(); + + if (userColumnOrder == null) { + // alapertelmezett + columnOrder.put("Archiválva", "descending"); + } else { + // hasznaljuk a mentett rendezest + Entry entry = userColumnOrder.entrySet().iterator().next(); + columnOrder.put(entry.getKey(), (String) entry.getValue()); } } -- 2.54.0