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

Simplify the logic toggling the enabled state of the Next button depending on the selection.

Browse Source 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
This commit is contained in:
Konstantina Chremmou 2018-05-30 12:17:18 +01:00 committed by Mihaela Stoica
parent 621fce4d70
commit 2e07781e6b
2 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
XenAdmin/Wizards/CrossPoolMigrateWizard/CrossPoolMigrateDestinationPage.cs
View File

@ -64,11 +64,6 @@ namespace XenAdmin.Wizards.CrossPoolMigrateWizard
InitializeText(); InitializeText();
} }
public override bool EnableNext()
{
return DestinationHasBeenSelected() && base.EnableNext();
}
protected override bool ImplementsIsDirty() protected override bool ImplementsIsDirty()
{ {
return true; return true;

33
XenAdmin/Wizards/GenericPages/SelectMultipleVMDestinationPage.cs
View File

@ -318,11 +318,6 @@ namespace XenAdmin.Wizards.GenericPages
updatingDestinationCombobox = false; updatingDestinationCombobox = false;
} }
protected bool DestinationHasBeenSelected()
{
return m_comboBoxConnection.SelectedItem != null;
}
private bool MatchingWithXenRefObject(IEnableableXenObjectComboBoxItem item, object xenRef) private bool MatchingWithXenRefObject(IEnableableXenObjectComboBoxItem item, object xenRef)
{ {
XenRef<Host> hostRef = xenRef as XenRef<Host>; XenRef<Host> hostRef = xenRef as XenRef<Host>;
@ -374,7 +369,6 @@ namespace XenAdmin.Wizards.GenericPages
ClearDataGridView(); ClearDataGridView();
SetButtonNextEnabled(true);
var hasPoolSharedStorage = HasPoolSharedStorage(); var hasPoolSharedStorage = HasPoolSharedStorage();
foreach (var kvp in m_vmMappings) foreach (var kvp in m_vmMappings)
@ -442,18 +436,20 @@ namespace XenAdmin.Wizards.GenericPages
{ {
if (cb.Value == null) if (cb.Value == null)
{ {
if (cb.Items.Count > 0) var firstEnabled = cb.Items.OfType<IEnableableComboBoxItem>().FirstOrDefault(i => i.Enabled);
if (firstEnabled != null)
{ {
if (cb.Items.OfType<IEnableableComboBoxItem>().All(i => !i.Enabled)) cb.Value = firstEnabled;
{ SetButtonNextEnabled(true);
cb.Value = null; }
SetButtonNextEnabled(false);
}
else
cb.Value = cb.Items.OfType<IEnableableComboBoxItem>().First(i => i.Enabled);
}
else else
SetButtonNextEnabled(false); //do not allow to leave the page if a vm has no target {
SetButtonNextEnabled(false);
}
}
else
{
SetButtonNextEnabled(true);
} }
} }
@ -601,8 +597,9 @@ namespace XenAdmin.Wizards.GenericPages
m_dataGridView.BeginEdit(false); m_dataGridView.BeginEdit(false);
if (m_dataGridView.EditingControl != null && m_dataGridView.EditingControl is ComboBox) var editingControl = m_dataGridView.EditingControl as ComboBox;
(m_dataGridView.EditingControl as ComboBox).DroppedDown = true; if (editingControl != null)
editingControl.DroppedDown = true;
} }
private void m_dataGridView_CurrentCellDirtyStateChanged(object sender, EventArgs e) private void m_dataGridView_CurrentCellDirtyStateChanged(object sender, EventArgs e)