From 78396156eaadd2ff3f3c4f92d6c9d3709bf40c09 Mon Sep 17 00:00:00 2001 From: Konstantina Chremmou Date: Tue, 15 Aug 2023 10:55:14 +0100 Subject: [PATCH] CA-375740: VMSS has no other_config, hence no custom fields can be set. Also, allow for a longer field label before ellipsization takes over. Signed-off-by: Konstantina Chremmou --- XenAdmin/Dialogs/PropertiesDialog.cs | 2 +- XenAdmin/SettingsPanels/CustomFieldsDisplayPage.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/XenAdmin/Dialogs/PropertiesDialog.cs b/XenAdmin/Dialogs/PropertiesDialog.cs index bdac9b8a8..94f72f9f4 100755 --- a/XenAdmin/Dialogs/PropertiesDialog.cs +++ b/XenAdmin/Dialogs/PropertiesDialog.cs @@ -134,7 +134,7 @@ namespace XenAdmin.Dialogs ShowTab(GeneralEditPage = new GeneralEditPage()); - if (!isVmAppliance) + if (!isVmAppliance && !isVmss) ShowTab(CustomFieldsEditPage = new CustomFieldsDisplayPage {AutoScroll = true}); if (isVm) diff --git a/XenAdmin/SettingsPanels/CustomFieldsDisplayPage.cs b/XenAdmin/SettingsPanels/CustomFieldsDisplayPage.cs index 7b4f833a2..d446acb2b 100644 --- a/XenAdmin/SettingsPanels/CustomFieldsDisplayPage.cs +++ b/XenAdmin/SettingsPanels/CustomFieldsDisplayPage.cs @@ -342,7 +342,7 @@ namespace XenAdmin.SettingsPanels return new Label { Anchor = AnchorStyles.Left | AnchorStyles.Right, - Text = customFieldDefinition.Name.EscapeAmpersands().Ellipsise(25), + Text = customFieldDefinition.Name.EscapeAmpersands().Ellipsise(45), Font = Program.DefaultFont, AutoSize = true, AutoEllipsis = false