Alapertelmezett rendezes az Archivalva

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 2d55d438c1bdc24a4126bcfcd37dc47726f78bae..d20a1c1247a1564675c381536884aa31c3c2f08d 100644 (file)
--- 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;\r
 import java.util.List;\r
 import java.util.Map;\r
+import java.util.Map.Entry;\r
 \r
 import org.apache.commons.lang.StringUtils;\r
 import org.apache.logging.log4j.LogManager;\r
@@ -924,10 +925,16 @@ public class GridSearchModel extends AsyncBaseModel {
        }\r
 \r
        private void setColumnOrder() {\r
-               if (SessionUtil.getUserColumnOrder() != null) {\r
-                       columnOrder = new HashMap<>();\r
-                       columnOrder.put(SessionUtil.getUserColumnOrder().entrySet().iterator().next().getKey(),\r
-                                       (String) SessionUtil.getUserColumnOrder().entrySet().iterator().next().getValue());\r
+               Map<String, Object> userColumnOrder = SessionUtil.getUserColumnOrder();\r
+               columnOrder = new HashMap<>();\r
+\r
+               if (userColumnOrder == null) {\r
+                       // alapertelmezett\r
+                       columnOrder.put("Archiválva", "descending");\r
+               } else {\r
+                       // hasznaljuk a mentett rendezest\r
+                       Entry<String, Object> entry = userColumnOrder.entrySet().iterator().next();\r
+                       columnOrder.put(entry.getKey(), (String) entry.getValue());\r
                }\r
        }\r
 \r