bump version to 1.0-42

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

diff --git a/js/MailProxyRelaying.js b/js/MailProxyRelaying.js
index da8757751d55def64e3cffcd49dac59d9f36d190..18561308a96b7cd9a9869b11657d40d96aa9031e 100644 (file)
--- a/js/MailProxyRelaying.js
+++ b/js/MailProxyRelaying.js
@@ -1,90 +1,95 @@
+/*global Proxmox*/
 Ext.define('PMG.MailProxyRelaying', {
     extend: 'Proxmox.grid.ObjectGrid',
     alias: ['widget.pmgMailProxyRelaying'],
 
+    monStoreErrors: true,
+    
     initComponent : function() {
        var me = this;
 
-       var rows = {
-           relay: {
-               required: true,
-               defaultValue: Proxmox.Utils.noneText,
-               header: gettext('Default Relay'),
-               editor: {
-                   xtype: 'proxmoxWindowEdit',
-                   subject: gettext('Default Relay'),
-                   items: {
-                       xtype: 'proxmoxtextfield',
-                       name: 'relay',
-                       deleteEmpty: true,
-                       fieldLabel: gettext('Default Relay')
-                   }
-               }
-           },
-           relayport: {
-               required: true,
-               defaultValue: 25,
-               header: gettext('SMTP port'),
-               editor: {
-                   xtype: 'proxmoxWindowEdit',
-                   subject: gettext('SMTP Port'),
-                   items: {
-                       xtype: 'proxmoxintegerfield',
-                       name: 'relayport',
-                       minValue: 1,
-                       maxValue: 65535,
-                       deleteEmpty: true,
-                       value: 25,
-                       fieldLabel: gettext('SMTP port')
+       me.add_text_row('relay', gettext('Default Relay'),
+                       { deleteEmpty: true, defaultValue: Proxmox.Utils.noneText });
+
+       me.add_integer_row('relayport', gettext('SMTP Port'),
+                          { defaultValue: 25, deleteEmpty: true,
+                            minValue: 1, maxValue: 65535 });
+
+       me.add_boolean_row('relaynomx', gettext('Disable MX lookup'));
+
+       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;
                    }
                }
-           },
-           relaynomx: {
-               required: true,
-               defaultValue: 0,
-               header: gettext('Disable MX lookup'),
-               renderer: Proxmox.Utils.format_boolean,
-               editor: {
-                   xtype: 'proxmoxWindowEdit',
-                   subject: gettext('Disable MX lookup'),
-                   items: {
-                       xtype: 'proxmoxcheckbox',
-                       name: 'relaynomx',
-                       uncheckedValue: 0,
-                       defaultValue: 0,
-                       deleteDefaultValue: true,
-                       fieldLabel: gettext('Disable MX lookup')
-                   }
+               if (result === '') {
+                   result = Proxmox.Utils.noneText;
                }
+               return result;
            },
-           smarthost: {
-               required: true,
-               defaultValue: Proxmox.Utils.noneText,
-               header: gettext('Smarthost'),
-               editor: {
-                   xtype: 'proxmoxWindowEdit',
-                   subject: gettext('Smarthost'),
-                   items: {
+           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';
 
+       me.selModel = Ext.create('Ext.selection.RowModel', {});
+
        Ext.apply(me, {
+           tbar: [{
+               text: gettext('Edit'),
+               xtype: 'proxmoxButton',
+               disabled: true,
+               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,
-           rows: rows,
            listeners: {
                itemdblclick: me.run_editor
            }
@@ -94,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);
     }
 });