bump version to 1.0-42

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

diff --git a/js/MailProxyRelaying.js b/js/MailProxyRelaying.js
index 6875deb8fff2c2ce939e69014482f224c9a80407..18561308a96b7cd9a9869b11657d40d96aa9031e 100644 (file)
--- a/js/MailProxyRelaying.js
+++ b/js/MailProxyRelaying.js
@@ -1,12 +1,15 @@
+/*global Proxmox*/
 Ext.define('PMG.MailProxyRelaying', {
     extend: 'Proxmox.grid.ObjectGrid',
     alias: ['widget.pmgMailProxyRelaying'],
 
+    monStoreErrors: true,
+    
     initComponent : function() {
        var me = this;
 
        me.add_text_row('relay', gettext('Default Relay'),
-                       { defaultValue: Proxmox.Utils.noneText });
+                       { deleteEmpty: true, defaultValue: Proxmox.Utils.noneText });
 
        me.add_integer_row('relayport', gettext('SMTP Port'),
                           { defaultValue: 25, deleteEmpty: true,
@@ -14,8 +17,59 @@ Ext.define('PMG.MailProxyRelaying', {
 
        me.add_boolean_row('relaynomx', gettext('Disable MX lookup'));
 
-       me.add_text_row('smarthost', gettext('Smarthost'),
-                       { defaultValue: Proxmox.Utils.noneText });
+       me.rows.smarthost = {
+           required: true,
+           multiKey: ['smarthost', 'smarthostport'],
+           header: gettext('Smarthost'),
+           renderer: function() {
+               var host = me.getObjectValue('smarthost', undefined);
+               var port = me.getObjectValue('smarthostport', undefined);
+               var result = '';
+               if (host) {
+                   if (port) {
+                       if (host.match(Proxmox.Utils.IP6_match)) {
+                           result = "[" + host + "]:" + port;
+                       } else {
+                           result = host + ':' + port;
+                       }
+                   } else {
+                       result = host;
+                   }
+               }
+               if (result === '') {
+                   result = Proxmox.Utils.noneText;
+               }
+               return result;
+           },
+           editor: {
+               xtype: 'proxmoxWindowEdit',
+               onlineHelp: 'pmgconfig_mailproxy_relaying',
+               subject: gettext('Smarthost'),
+               fieldDefaults: {
+                   labelWidth: 100
+               },
+               items: [
+                   {
+                       xtype: 'proxmoxtextfield',
+                       name: 'smarthost',
+                       deleteEmpty: true,
+                       emptyText: Proxmox.Utils.noneText,
+                       fieldLabel: gettext('Smarthost')
+                   },
+                   {
+                       xtype: 'proxmoxintegerfield',
+                       name: 'smarthostport',
+                       deleteEmpty: true,
+                       minValue: 1,
+                       maxValue: 65535,
+                       emptyText: Proxmox.Utils.defaultText,
+                       fieldLabel: gettext('Port')
+                   }
+               ]
+           }
+       };
+
+       me.rows.smarthostport = { visible: false };
 
        var baseurl = '/config/mail';
 
@@ -26,12 +80,13 @@ Ext.define('PMG.MailProxyRelaying', {
                text: gettext('Edit'),
                xtype: 'proxmoxButton',
                disabled: true,
-               handler: function() { me.run_editor() },
+               handler: function() { me.run_editor(); },
                selModel: me.selModel
            }],
            url: '/api2/json' + baseurl,
            editorConfig: {
                url: '/api2/extjs' + baseurl,
+               onlineHelp: 'pmgconfig_mailproxy_relaying'
            },
            interval: 5000,
            cwidth1: 200,
@@ -44,5 +99,6 @@ Ext.define('PMG.MailProxyRelaying', {
 
        me.on('activate', me.rstore.startUpdate);
        me.on('destroy', me.rstore.stopUpdate);
+       me.on('deactivate', me.rstore.stopUpdate);
     }
 });