[pmg-devel] [PATCH pmg-gui v2 2/2] rename TLSDomain to TLSDestination

Stoiko Ivanov s.ivanov at proxmox.com
Wed Mar 18 11:23:48 CET 2020


with the changes for fixing #1948 it is now possible to define tls policies
for destinations (remote domains or next-hop transports) instead of only for
Domains.
This patch reflects this addition by renaming all occurences of Domain with
Destination.

Signed-off-by: Stoiko Ivanov <s.ivanov at proxmox.com>
---
 ...TLSDomains.js => MailProxyTLSDestinations.js} | 16 ++++++++--------
 js/MailProxyTLSPanel.js                          |  8 ++++----
 js/Makefile                                      |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)
 rename js/{MailProxyTLSDomains.js => MailProxyTLSDestinations.js} (89%)

diff --git a/js/MailProxyTLSDomains.js b/js/MailProxyTLSDestinations.js
similarity index 89%
rename from js/MailProxyTLSDomains.js
rename to js/MailProxyTLSDestinations.js
index 4fa082c..16c3396 100644
--- a/js/MailProxyTLSDomains.js
+++ b/js/MailProxyTLSDestinations.js
@@ -13,9 +13,9 @@ Ext.define('pmg-tls-policy', {
     }
 });
 
-Ext.define('PMG.TLSDomainEdit', {
+Ext.define('PMG.TLSDestinationEdit', {
     extend: 'Proxmox.window.Edit',
-    xtype: 'pmgTLSDomainEdit',
+    xtype: 'pmgTLSDestinationEdit',
     onlineHelp: 'pmgconfig_mailproxy_tls',
 
     subject: gettext('TLS Policy'),
@@ -32,7 +32,7 @@ Ext.define('PMG.TLSDomainEdit', {
 	    {
 		xtype: isCreate ? 'proxmoxtextfield' : 'displayfield',
 		name: 'destination',
-		fieldLabel: gettext('Domain')
+		fieldLabel: gettext('Destination')
 	    },
 	    {
 		xtype: 'proxmoxKVComboBox',
@@ -65,16 +65,16 @@ Ext.define('PMG.TLSDomainEdit', {
     }
 });
 
-Ext.define('PMG.MailProxyTLSDomains', {
+Ext.define('PMG.MailProxyTLSDestinations', {
     extend: 'Ext.grid.GridPanel',
-    alias: ['widget.pmgMailProxyTLSDomains'],
+    alias: ['widget.pmgMailProxyTLSDestinations'],
 
     viewConfig: {
 	trackOver: false
     },
     columns: [
 	{
-	    header: gettext('Domain'),
+	    header: gettext('Destination'),
 	    width: 200,
 	    sortable: true,
 	    dataIndex: 'destination'
@@ -109,7 +109,7 @@ Ext.define('PMG.MailProxyTLSDomains', {
 		return;
 	    }
 
-	    var win = Ext.createWidget('pmgTLSDomainEdit', {
+	    var win = Ext.createWidget('pmgTLSDestinationEdit', {
 		destination: rec.data.destination
 	    });
 
@@ -128,7 +128,7 @@ Ext.define('PMG.MailProxyTLSDomains', {
 	    {
 		text: gettext('Create'),
 		handler: function() {
-		    var win = Ext.createWidget('pmgTLSDomainEdit');
+		    var win = Ext.createWidget('pmgTLSDestinationEdit');
 
 		    win.load();
 		    win.on('destroy', reload);
diff --git a/js/MailProxyTLSPanel.js b/js/MailProxyTLSPanel.js
index 5f5c367..1838d1c 100644
--- a/js/MailProxyTLSPanel.js
+++ b/js/MailProxyTLSPanel.js
@@ -21,16 +21,16 @@ Ext.define('PMG.MailProxyTLSPanel', {
 	    title: gettext('Settings')
 	});
 
-	var tlsDomains = Ext.create('PMG.MailProxyTLSDomains', {
-	    title: gettext('TLS Domain Policy'),
+	var tlsDestinations = Ext.create('PMG.MailProxyTLSDestinations', {
+	    title: gettext('TLS Destination Policy'),
 	    flex: 1
 	});
 
-	me.items = [ tlsSettings, tlsDomains ];
+	me.items = [ tlsSettings, tlsDestinations ];
 
 	me.callParent();
 
 	tlsSettings.relayEvents(me, ['activate', 'deactivate', 'destroy']);
-	tlsDomains.relayEvents(me, ['activate', 'deactivate', 'destroy']);
+	tlsDestinations.relayEvents(me, ['activate', 'deactivate', 'destroy']);
     }
 });
diff --git a/js/Makefile b/js/Makefile
index 353062c..b8102d1 100644
--- a/js/Makefile
+++ b/js/Makefile
@@ -42,7 +42,7 @@ JSSRC=							\
 	MailProxyOptions.js				\
 	MailProxyTLS.js					\
 	MailProxyTLSPanel.js				\
-	MailProxyTLSDomains.js				\
+	MailProxyTLSDestinations.js			\
 	Transport.js					\
 	MyNetworks.js					\
 	RelayDomains.js					\
-- 
2.20.1




More information about the pmg-devel mailing list