From dae26b9574df6e1068f372f4cfb5615e60fefddc Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Sat, 25 Feb 2017 10:36:49 +0100
Subject: [PATCH] MailProxyRelaying: use add_boolean_row and add_integer_row
 helpers

---
 js/MailProxyRelaying.js | 101 ++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 67 deletions(-)

diff --git a/js/MailProxyRelaying.js b/js/MailProxyRelaying.js
index da87577..158994b 100644
--- a/js/MailProxyRelaying.js
+++ b/js/MailProxyRelaying.js
@@ -5,74 +5,42 @@ Ext.define('PMG.MailProxyRelaying', {
     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')
-		    }
+	me.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')
-		    }
-		}
-	    },
-	    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')
-		    }
-		}
-	    },
-	    smarthost: {
-		required: true,
-		defaultValue: Proxmox.Utils.noneText,
-		header: gettext('Smarthost'),
-		editor: {
-		    xtype: 'proxmoxWindowEdit',
-		    subject: gettext('Smarthost'),
-		    items: {
-			xtype: 'proxmoxtextfield',
-			name: 'smarthost',
-			deleteEmpty: true,
-			fieldLabel: gettext('Smarthost')
-		    }
-		}
-	    },
+	    }
+	};
 
+	me.add_integer_row('relayport', gettext('SMTP Port'),
+			   { defaultValue: 25, deleteEmpty: true,
+			     minValue: 1, maxValue: 65535 });
+
+	me.add_boolean_row('relaynomx', ettext('Disable MX lookup'));
+
+	me.rows.smarthost = {
+	    required: true,
+	    defaultValue: Proxmox.Utils.noneText,
+	    header: gettext('Smarthost'),
+	    editor: {
+		xtype: 'proxmoxWindowEdit',
+		subject: gettext('Smarthost'),
+		items: {
+		    xtype: 'proxmoxtextfield',
+		    name: 'smarthost',
+		    deleteEmpty: true,
+		    fieldLabel: gettext('Smarthost')
+		}
+	    }
 	};
 
 	var baseurl = '/config/mail';
@@ -84,7 +52,6 @@ Ext.define('PMG.MailProxyRelaying', {
 	    },
 	    interval: 5000,
 	    cwidth1: 200,
-	    rows: rows,
 	    listeners: {
 		itemdblclick: me.run_editor
 	    }