diff options
| author | Vsevolod Stakhov <vsevolod@rspamd.com> | 2022-11-06 16:20:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-06 16:20:40 +0000 |
| commit | 3c993db821ffa5ef5f251e15bda9da1307e618a2 (patch) | |
| tree | 6e7fde208bbb7043f97f0452f27f9c5d85f11e50 | |
| parent | 6684cdd168704a55bbf88725c965f8239c859cfe (diff) | |
| parent | 50a162c74fb7e0c4ddcbe130fc393b650a769c1d (diff) | |
| download | rspamd-3c993db821ffa5ef5f251e15bda9da1307e618a2.tar.gz rspamd-3c993db821ffa5ef5f251e15bda9da1307e618a2.zip | |
Merge pull request #4326 from moisseev/webui
[WebUI] Add legacy history version badge
| -rw-r--r-- | .eslintrc.json | 1 | ||||
| -rw-r--r-- | interface/index.html | 3 | ||||
| -rw-r--r-- | interface/js/app/history.js | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/.eslintrc.json b/.eslintrc.json index 4f0041692..714c80f7c 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -26,6 +26,7 @@ // "singleLine": { "afterColon": false } // }], "line-comment-position": "off", + "logical-assignment-operators": ["error", "never"], "max-params": ["warn", 6], "max-statements": ["warn", 44], "max-statements-per-line": ["error", { "max": 2 }], diff --git a/interface/index.html b/interface/index.html index 5b1c1f0d0..b8ccfa3f6 100644 --- a/interface/index.html +++ b/interface/index.html @@ -584,6 +584,9 @@ <div class="card-header text-secondary py-1 d-flex"> <span class="icon mr-3"><i class="fas fa-eye"></i></span> <span class="h6 font-weight-bolder my-2 ml-0">History</span> + <a href="https://rspamd.com/doc/modules/history_redis.html" target="_blank" rel="noopener noreferrer" + title="If you'd like to use the modern version of History, please enable History redis module." + id="legacy-history-badge" class="my-2 ml-2 badge badge-info" style="display: none;">Legacy version</a> <div class="form-inline card-header-form input-group-sm align-self-center ml-auto mr-1"> <label for="selSymOrder_history">Symbols order:</label> <select id="selSymOrder_history" class="form-control ml-1"> diff --git a/interface/js/app/history.js b/interface/js/app/history.js index b9b3831ea..a9e40c7b4 100644 --- a/interface/js/app/history.js +++ b/interface/js/app/history.js @@ -349,9 +349,11 @@ define(["jquery", "footable"], return e.rows; })); data.version = version; + $("#legacy-history-badge").hide(); } else { // Legacy version data = [].concat.apply([], neighbours_data); + $("#legacy-history-badge").show(); } var o = process_history_data(rspamd, data); var items = o.items; |