Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-25 14:27:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1086 from kc284/master

Browse Source 
Fixed issue on the New SR wizard where the SR type details panel was not populated when the default checked button was invisible.
This commit is contained in:
Frezzle 2016-07-28 15:02:46 +01:00 committed by GitHub
commit c97787f8f4
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrTypePage.Designer.cs generated
View File

@ -141,6 +141,7 @@
//
// SRBlurb
//
this.SRBlurb.AutoEllipsis = true;
resources.ApplyResources(this.SRBlurb, "SRBlurb");
this.SRBlurb.Name = "SRBlurb";
//

8
XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrTypePage.cs
View File

@ -138,6 +138,14 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages
if (radioButton.Visible && radioButton.Tag.GetType() == m_preselectedWizardType)
radioButton.Checked = true;
}
bool visibleRadioButtonsExist = _radioButtons.Any(r => r.Visible);
bool checkedRadioButtonExists = _radioButtons.Any(r => r.Visible && r.Checked);
tableLayoutPanel2.Visible = visibleRadioButtonsExist;
if (visibleRadioButtonsExist && !checkedRadioButtonExists)
_radioButtons.First(r => r.Visible).Checked = true;
}
else
{

10
XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrTypePage.resx
View File

@ -468,13 +468,13 @@
<value>Fill</value>
</data>
<data name="SRBlurb.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 154</value>
<value>3, 167</value>
</data>
<data name="SRBlurb.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 0</value>
</data>
<data name="SRBlurb.Size" type="System.Drawing.Size, System.Drawing">
<value>312, 176</value>
<value>312, 163</value>
</data>
<data name="SRBlurb.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
@ -540,10 +540,10 @@
<value>Microsoft Sans Serif, 8.25pt, style=Italic</value>
</data>
<data name="selectedStoreTypeLabel.Location" type="System.Drawing.Point, System.Drawing">
<value>3, 124</value>
<value>3, 137</value>
</data>
<data name="selectedStoreTypeLabel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>3, 3, 3, 0</value>
<value>3, 16, 3, 14</value>
</data>
<data name="selectedStoreTypeLabel.Size" type="System.Drawing.Size, System.Drawing">
<value>122, 13</value>
@ -594,7 +594,7 @@
<value>0</value>
</data>
<data name="tableLayoutPanel2.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="upsellPage1" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="SRBlurb" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="deprecationBanner" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="selectedStoreTypeLabel" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,Absolute,30,Percent,100" /&gt;&lt;/TableLayoutSettings&gt;</value>
<value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="upsellPage1" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="SRBlurb" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="deprecationBanner" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="selectedStoreTypeLabel" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,Percent,100" /&gt;&lt;/TableLayoutSettings&gt;</value>
</data>
<data name="tableLayoutPanel3.ColumnCount" type="System.Int32, mscorlib">
<value>1</value>