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 #1124 from GaborApatiNagy/CA-174979

Browse Source 
CA-174979: Confusing right-click add to pool menu (if you accept the defaults)
This commit is contained in:
Konstantina Chremmou 2016-09-20 13:15:36 +01:00 committed by GitHub
commit 6bb71ffd23
3 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
XenAdmin/Dialogs/NewPoolDialog.cs
View File

@ -62,7 +62,7 @@ namespace XenAdmin.Dialogs
customTreeViewServers.ShowImages = false;
getAllCurrentConnections();
ConnectionsManager.XenConnections.CollectionChanged += XenConnections_CollectionChanged;
poolName = generatePoolName();
poolName = string.Empty; //forcing user to enter something before the Next button is enabled
selectMaster(host);
updateButtons();
}
@ -121,20 +121,6 @@ namespace XenAdmin.Dialogs
}
}
private string generatePoolName()
{
List<string> poolNames = new List<string>();
foreach (IXenConnection c in ConnectionsManager.XenConnectionsCopy)
{
Pool p = Helpers.GetPoolOfOne(c);
if (p != null)
{
poolNames.Add(Helpers.GetName(p));
}
}
return Helpers.MakeUniqueName(Messages.NEW_POOL, poolNames);
}
private void createPool()
{
try

11
XenModel/Messages.Designer.cs generated
View File

@ -1,7 +1,7 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
// Runtime Version:4.0.30319.34209
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@ -22685,15 +22685,6 @@ namespace XenAdmin {
}
}
/// <summary>
/// Looks up a localized string similar to New Pool.
/// </summary>
public static string NEW_POOL {
get {
return ResourceManager.GetString("NEW_POOL", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to You are attempting to add the server &apos;{0}&apos; to a pool with a master that is configured to use AD authentication. All pool members must use the same authentication method.
///

3
XenModel/Messages.resx
View File

@ -8487,9 +8487,6 @@ Once the VM has restarted click the Install [XenServer product] Tools menu item
<data name="NEW_POLICY" xml:space="preserve">
<value>&amp;New Policy...</value>
</data>
<data name="NEW_POOL" xml:space="preserve">
<value>New Pool</value>
</data>
<data name="NEW_POOL_AD_MESSAGE" xml:space="preserve">
<value>You are attempting to add the server '{0}' to a pool with a master that is configured to use AD authentication. All pool members must use the same authentication method.