js/RBLStatistics.js - show pregreet rejects, change title to 'Postscreen'

diff --git a/js/NavigationTree.js b/js/NavigationTree.js
index b9550d5bb6583e9310a5fb00c4267e4636b6aa33..342c715b91be9c004f16e95e643b1d43927e8688 100644 (file)
--- a/js/NavigationTree.js
+++ b/js/NavigationTree.js
@@ -157,7 +157,7 @@ Ext.define('PMG.store.NavigationStore', {
                        leaf: true
                    },
                    {
-                       text: gettext('RBL'),
+                       text: gettext('Postscreen'),
                        iconCls: 'fa fa-line-chart',
                        path: 'pmgRBLStatistics',
                        leaf: true

diff --git a/js/RBLStatistics.js b/js/RBLStatistics.js
index f6939c5311b5a973b0afc51b81370a8b3b7841fc..2be9678b97322ddb0c9a5e1683cc24632a4225a1 100644 (file)
--- a/js/RBLStatistics.js
+++ b/js/RBLStatistics.js
@@ -7,25 +7,23 @@ Ext.define('PMG.RBLStatistics', {
 
     bodyPadding: '10 0 10 10',
 
-    title: gettext('Statistics') + ': ' + gettext('RBL rejects'),
+    title: gettext('Statistics') + ': ' + gettext('Postscreen'),
 
     tbar: [ { xtype: 'pmgStatTimeSelector' } ],
 
     items: [
        {
-           title: gettext('RBL rejects'),
+           title: gettext('Rejects'),
            xtype: 'proxmoxRRDChart',
-           legend: false,
-           fields: [ 'count' ],
-           fieldTitles: [
-               gettext('RBL rejects')
-           ],
+           fields: [ 'rbl_rejects', 'pregreet_rejects'],
+           fieldTitles: ['RBL', 'PREGREET'],
            store: {
                type: 'pmgStatStore',
                includeTimeSpan: true,
-               staturl: "/api2/json/statistics/rblcount",
+               staturl: "/api2/json/statistics/rejectcount",
                fields: [
-                   { type: 'integer', name: 'count' },
+                   { type: 'integer', name: 'rbl_rejects' },
+                   { type: 'integer', name: 'pregreet_rejects' },
                    { type: 'date', dateFormat: 'timestamp', name: 'time' }
                ]
            }