bump version to 1.0-35

[pmg-gui.git] / js / MailTracker.js

diff --git a/js/MailTracker.js b/js/MailTracker.js
index d1426cb2b9dbd5eedf4e3d53e12e4404ce9dafa7..9cf9fa497d4b159bde6c4defac525799b57151a9 100644 (file)
--- a/js/MailTracker.js
+++ b/js/MailTracker.js
@@ -4,7 +4,7 @@ Ext.define('pmg-mail-tracker', {
     fields: [
        'id' , 'from', 'to', 'dstatus', 'rstatus', 'qid', 'msgid', 'client',
        { type: 'number', name: 'size' },
-       { type: 'date', dateFormat: 'timestamp', name: 'time' },
+       { type: 'date', dateFormat: 'timestamp', name: 'time' }
     ],
     proxy: {
        type: 'proxmox'
@@ -105,6 +105,15 @@ Ext.define('PMG.MailTrackerFilter', {
                    fieldLabel: gettext('End'),
                    reference: 'endtime',
                    listeners: { change: 'onFilterChange' },
+                   value: (function() {
+                       var now = new Date();
+                       var tomorrow = new Date();
+                       tomorrow.setDate(now.getDate()+1);
+                       tomorrow.setHours(0);
+                       tomorrow.setMinutes(0);
+                       tomorrow.setSeconds(0);
+                       return tomorrow;
+                   }()),
                    xtype: 'promxoxDateTimeField'
                },
                {
@@ -208,7 +217,7 @@ Ext.define('PMG.MailTracker', {
 
     border: false,
 
-    emptyText: gettext('No data in database.'),
+    emptyText: gettext('No data in database'),
     disableSelection: true,
 
     viewConfig: {
@@ -336,7 +345,9 @@ Ext.define('PMG.MailTracker', {
                if (v !== undefined && v !== '') {
                    var vtext = PMG.Utils.mail_status_map[v] || v;
                    icon = v;
-                   if (rstatus !== undefined && rstatus !== '') {
+                   if (v === 'Q' || v === 'B') {
+                       returntext = vtext;
+                   } else  if (rstatus !== undefined && rstatus !== '') {
                        var rtext = PMG.Utils.mail_status_map[rstatus] || rstatus;
                        returntext = vtext + '/' + rtext;
                        icon = rstatus;