From: Alexander Moisseev <moiseev@mezonplus.ru>
Date: Fri, 28 Sep 2018 09:48:19 +0000 (+0300)
Subject: [WebUI] History: add sorting by symbol score value
X-Git-Tag: 1.8.1~141^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F2548%2Fhead;p=thirdparty%2Frspamd.git

[WebUI] History: add sorting by symbol score value
---

diff --git a/interface/index.html b/interface/index.html
index 6eebef1d4f..1cf363b96e 100644
--- a/interface/index.html
+++ b/interface/index.html
@@ -291,7 +291,8 @@
 							<div class="form-group widget-title-form">
 								<label for="selSymOrder">Symbols order:</label>
 								<select id="selSymOrder" class="form-control">
-									<option value="score" selected>Score</option>
+									<option value="magnitude" selected>Score magnitude</option>
+									<option value="score">Score value</option>
 									<option value="name">Name</option>
 								</select>
 							</div>
diff --git a/interface/js/app/history.js b/interface/js/app/history.js
index f82925b265..3d1983b236 100644
--- a/interface/js/app/history.js
+++ b/interface/js/app/history.js
@@ -113,7 +113,7 @@ define(["jquery", "footable", "humanize"],
         }
 
         function process_history_v2(data) {
-        // Display no more than rcpt_lim recipients
+            // Display no more than rcpt_lim recipients
             var rcpt_lim = 3;
             var items = [];
 
@@ -121,13 +121,23 @@ define(["jquery", "footable", "humanize"],
                 var e = document.getElementById(id);
                 return e.options[e.selectedIndex].value;
             }
-            var compare = (getSelector("selSymOrder") === "score")
-                ? function (e1, e2) {
-                    return Math.abs(e2.score) - Math.abs(e1.score);
-                }
-                : function (e1, e2) {
-                    return e1.name.localeCompare(e2.name);
-                };
+            var compare = null;
+            switch (getSelector("selSymOrder")) {
+                case "score":
+                    compare = function (e1, e2) {
+                        return e2.score - e1.score;
+                    };
+                    break;
+                case "name":
+                    compare = function (e1, e2) {
+                        return e1.name.localeCompare(e2.name);
+                    };
+                    break;
+                default:
+                    compare = function (e1, e2) {
+                        return Math.abs(e2.score) - Math.abs(e1.score);
+                    };
+            }
 
             $("#selSymOrder, label[for='selSymOrder']").show();