Merge branch 'proxmox:master' into master

wy414012 · Oct 17, 2024 · 1ce559f · 1ce559f
2 parents d5289f0 + 9266474
commit 1ce559f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/www/manager6/ceph/CephInstallWizard.js b/www/manager6/ceph/CephInstallWizard.js
@@ -169,7 +169,7 @@ Ext.define('PVE.ceph.CephInstallWizard', {
 		    return ''; // should be hidden
 		} else if (repo === 'no-subscription') {
 		    return allSub
-		        ? gettext("Cluster has active subscriptions and would be elligible for using the enterprise repository.")
+		        ? gettext("Cluster has active subscriptions and would be eligible for using the enterprise repository.")
 		        : gettext("The no-subscription repository is not the best choice for production setups.");
 		} else {
 		    return gettext('The test repository should only be used for test setups or after consulting the official Proxmox support!');

diff --git a/www/manager6/node/Certificates.js b/www/manager6/node/Certificates.js
@@ -305,7 +305,7 @@ Ext.define('PVE.node.Certificates', {
 	    dataIndex: 'subject',
 	},
 	{
-	    header: gettext('Public Key Alogrithm'),
+	    header: gettext('Public Key Algorithm'),
 	    flex: 1,
 	    dataIndex: 'public-key-type',
 	    hidden: true,

diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js
@@ -103,7 +103,7 @@ Ext.define('PVE.qemu.HardwareView', {
 		tdCls: 'pve-itype-icon-cpu',
 		group: 3,
 		defaultValue: '1',
-		multiKey: ['sockets', 'cpu', 'cores', 'numa', 'vcpus', 'cpulimit', 'cpuunits'],
+		multiKey: ['sockets', 'cpu', 'cores', 'numa', 'vcpus', 'cpulimit', 'cpuunits', 'affinity'],
 		renderer: function(value, metaData, record, rowIndex, colIndex, store, pending) {
 		    var sockets = me.getObjectValue('sockets', 1, pending);
 		    var model = me.getObjectValue('cpu', undefined, pending);
@@ -112,6 +112,7 @@ Ext.define('PVE.qemu.HardwareView', {
 		    var vcpus = me.getObjectValue('vcpus', undefined, pending);
 		    var cpulimit = me.getObjectValue('cpulimit', undefined, pending);
 		    var cpuunits = me.getObjectValue('cpuunits', undefined, pending);
+		    var cpuaffinity = me.getObjectValue('affinity', undefined, pending);
 
 		    let res = Ext.String.format(
 		        '{0} ({1} sockets, {2} cores)', sockets * cores, sockets, cores);
@@ -131,6 +132,9 @@ Ext.define('PVE.qemu.HardwareView', {
 		    if (cpuunits) {
 			res += ' [cpuunits=' + cpuunits +']';
 		    }
+		    if (cpuaffinity) {
+			res += ' [cpuaffinity=' + cpuaffinity + ']';
+		    }
 
 		    return res;
 		},
@@ -214,6 +218,9 @@ Ext.define('PVE.qemu.HardwareView', {
 	    ostype: {
 		visible: false,
 	    },
+	    affinity: {
+		visible: false,
+	    },
 	};
 
 	PVE.Utils.forEachBus(undefined, function(type, id) {

diff --git a/www/manager6/storage/BackupView.js b/www/manager6/storage/BackupView.js
@@ -1,6 +1,8 @@
 Ext.define('PVE.storage.BackupView', {
     extend: 'PVE.storage.ContentView',
 
+    onlineHelp: 'chapter_vzdump',
+
     alias: 'widget.pveStorageBackupView',
 
     showColumns: ['name', 'notes', 'protected', 'date', 'format', 'size'],

diff --git a/www/mobile/Toolkit.js b/www/mobile/Toolkit.js
@@ -7,4 +7,4 @@ Ext.Ajax.setDisableCaching(false);
 // do not send '_dc' parameter
 Ext.Ajax.disableCaching = false;
 
-Ext.Loader.injectScriptElement = (url) => console.warn(`surpressed loading ${url}`);
+Ext.Loader.injectScriptElement = (url) => console.warn(`suppressed loading ${url}`);