[pve-devel] [PATCH manager 2/3] ext6migrate: fix subscription tab

[Dominik Csapak]

fixes:
 * update deprecated field
 * move static configuration to class definition
 * change applyIf to apply
 * change system report handler to pass a function to
    check_command (instead of the result of showReport)

Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
 www/manager6/node/Subscription.js | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/www/manager6/node/Subscription.js b/www/manager6/node/Subscription.js
index 801c8e7..2eefcb0 100644
--- a/www/manager6/node/Subscription.js
+++ b/www/manager6/node/Subscription.js
@@ -1,20 +1,16 @@
 Ext.define('PVE.node.SubscriptionKeyEdit', {
     extend: 'PVE.window.Edit',
-
+    title: gettext('Upload Subscription Key'),
+    width: 300,
+    items: {
+	xtype: 'textfield',
+	name: 'key',
+	value: '',
+	fieldLabel: gettext('Subscription Key')
+    },
     initComponent : function() {
 	var me = this;
 
-	Ext.apply(me, {
-	    title: gettext('Upload Subscription Key'),
-	    width: 300,
-	    items: {
-		xtype: 'textfield',
-		name: 'key',
-		value: '',
-		fieldLabel: gettext('Subscription Key')
-	    }
-	});
-
 	me.callParent();
 
 	me.load();
@@ -39,7 +35,7 @@ Ext.define('PVE.node.Subscription', {
 
 	var view = Ext.createWidget('component', {
 	    itemId: 'system-report-view',
-	    autoScroll: true,
+	    scrollable: true,
 	    style: {
 		'background-color': 'white',
 		'white-space': 'pre',
@@ -148,7 +144,7 @@ Ext.define('PVE.node.Subscription', {
 	    }
 	};
 
-	Ext.applyIf(me, {
+	Ext.apply(me, {
 	    url: '/api2/json' + baseurl,
 	    cwidth1: 170,
 	    tbar: [ 
@@ -180,7 +176,7 @@ Ext.define('PVE.node.Subscription', {
 		{
 		    text: gettext('System Report'),
 		    handler: function() {
-			PVE.Utils.checked_command(me.showReport());
+			PVE.Utils.checked_command(function (){ me.showReport(); });
 		    }
 		}
 	    ],
-- 
2.1.4