Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-23 20:36:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #683 from MihaelaStoica/hide_convert_sr

Browse Source 
Revert "Temporarily hide "Convert SR""
This commit is contained in:
Stephen Turner 2015-09-29 14:58:19 +01:00
commit d28e97093c
4 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XenAdmin/Commands/Controls/ContextMenuBuilder.cs
View File

@ -925,7 +925,7 @@ namespace XenAdmin.Commands
items.AddIfEnabled(new SetAsDefaultSRCommand(mainWindow, selection));
items.AddIfEnabled(new ShareSRCommand(mainWindow, selection));
items.AddIfEnabled(new UpgradeSRCommand(mainWindow, selection));
//items.AddIfEnabled(new ConvertToThinSRCommand(mainWindow, selection));
items.AddIfEnabled(new ConvertToThinSRCommand(mainWindow, selection));
items.AddSeparator();
items.AddIfEnabled(new DetachSRCommand(mainWindow, selection));

12
XenAdmin/MainWindow.resx
View File

@ -2375,12 +2375,6 @@
<data name="DestroyStorageRepositoryToolStripMenuItem.Text" xml:space="preserve">
<value>Destr&amp;oy</value>
</data>
<data name="ConvertToThinStorageRepositoryToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>186, 22</value>
</data>
<data name="ConvertToThinStorageRepositoryToolStripMenuItem.Visible" type="System.Boolean, mscorlib">
<value>False</value>
</data>
<data name="toolStripSeparator18.Size" type="System.Drawing.Size, System.Drawing">
<value>183, 6</value>
</data>
@ -3566,12 +3560,6 @@
<data name="&gt;&gt;DestroyStorageRepositoryToolStripMenuItem.Type" xml:space="preserve">
<value>XenAdmin.Commands.CommandToolStripMenuItem, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;ConvertToThinStorageRepositoryToolStripMenuItem.Name" xml:space="preserve">
<value>ConvertToThinStorageRepositoryToolStripMenuItem</value>
</data>
<data name="&gt;&gt;ConvertToThinStorageRepositoryToolStripMenuItem.Type" xml:space="preserve">
<value>XenAdmin.Commands.CommandToolStripMenuItem, XenCenterMain, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;toolStripSeparator18.Name" xml:space="preserve">
<value>toolStripSeparator18</value>
</data>

4
XenAdmin/TabPages/GeneralTabPage.cs
View File

@ -1234,10 +1234,10 @@ namespace XenAdmin.TabPages
s.AddEntry(FriendlyName("SR.size"), sr.SizeString);
IEnumerable<CommandToolStripMenuItem> menuItems = null;
/*if (sr.Provisioning == SrProvisioning.Thick && (sr.type == "lvmohba" || sr.type == "lvmoiscsi"))
if (sr.Provisioning == SrProvisioning.Thick && (sr.type == "lvmohba" || sr.type == "lvmoiscsi"))
{
menuItems = new[] { new CommandToolStripMenuItem(new ConvertToThinSRCommand(Program.MainWindow, new List<SelectedItem> () { new SelectedItem(xenObject)} ), true) };
}*/
}
s.AddEntry(FriendlyName("SR.provisioning"), sr.IsThinProvisioned
? string.Format(Messages.SR_THIN_PROVISIONING_COMMITTED, sr.PercentageCommitted)
: Messages.SR_THICK_PROVISIONING, menuItems);

32
XenAdminTests/TabsAndMenus/MainMenuGeorge.cs
View File

@ -149,7 +149,7 @@ namespace XenAdminTests.TabsAndMenus
new ExpectedTextMenuItem("R&eattach...", false, false ),
new ExpectedTextMenuItem("&Forget", false, false ),
new ExpectedTextMenuItem("Destr&oy...", false, false ),
//new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedSeparator(),
new ExpectedTextMenuItem("P&roperties", false, false )
};
@ -260,7 +260,7 @@ namespace XenAdminTests.TabsAndMenus
new ExpectedTextMenuItem("R&eattach...", false, false ),
new ExpectedTextMenuItem("&Forget", false, false ),
new ExpectedTextMenuItem("Destr&oy...", false, false ),
//new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedSeparator(),
new ExpectedTextMenuItem("P&roperties", false, false )
};
@ -372,7 +372,7 @@ namespace XenAdminTests.TabsAndMenus
new ExpectedTextMenuItem("R&eattach...", false, false ),
new ExpectedTextMenuItem("&Forget", false, false ),
new ExpectedTextMenuItem("Destr&oy...", false, false ),
//new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedSeparator(),
new ExpectedTextMenuItem("P&roperties", false, false )
};
@ -485,7 +485,7 @@ namespace XenAdminTests.TabsAndMenus
new ExpectedTextMenuItem("R&eattach...", false, false ),
new ExpectedTextMenuItem("&Forget", false, false ),
new ExpectedTextMenuItem("Destr&oy...", false, false ),
//new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedSeparator(),
new ExpectedTextMenuItem("P&roperties", false, false )
};
@ -600,7 +600,7 @@ namespace XenAdminTests.TabsAndMenus
new ExpectedTextMenuItem("R&eattach...", false, false ),
new ExpectedTextMenuItem("&Forget", false, false ),
new ExpectedTextMenuItem("Destr&oy...", false, false ),
//new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedSeparator(),
new ExpectedTextMenuItem("P&roperties", false, false )
};
@ -716,7 +716,7 @@ namespace XenAdminTests.TabsAndMenus
new ExpectedTextMenuItem("R&eattach...", false, false ),
new ExpectedTextMenuItem("&Forget", CanForget(sr), false ),
new ExpectedTextMenuItem("Destr&oy...", CanDestroy(sr), false ),
//new ExpectedTextMenuItem("&Convert SR...", CanConvertSR(sr), false ),
new ExpectedTextMenuItem("&Convert SR...", CanConvertSR(sr), false ),
new ExpectedSeparator(),
new ExpectedTextMenuItem("P&roperties", true, false )
};
@ -833,7 +833,7 @@ namespace XenAdminTests.TabsAndMenus
new ExpectedTextMenuItem("R&eattach...", false, false ),
new ExpectedTextMenuItem("&Forget", false, false ),
new ExpectedTextMenuItem("Destr&oy...", false, false ),
//new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedSeparator(),
new ExpectedTextMenuItem("P&roperties", false, false )
};
@ -953,7 +953,7 @@ namespace XenAdminTests.TabsAndMenus
new ExpectedTextMenuItem("R&eattach...", false, false ),
new ExpectedTextMenuItem("&Forget", false, false ),
new ExpectedTextMenuItem("Destr&oy...", false, false ),
//new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedSeparator(),
new ExpectedTextMenuItem("P&roperties", false, false )
};
@ -1074,7 +1074,7 @@ namespace XenAdminTests.TabsAndMenus
new ExpectedTextMenuItem("R&eattach...", false, false ),
new ExpectedTextMenuItem("&Forget", false, false ),
new ExpectedTextMenuItem("Destr&oy...", false, false ),
//new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedSeparator(),
new ExpectedTextMenuItem("P&roperties", false, false )
};
@ -1196,7 +1196,7 @@ namespace XenAdminTests.TabsAndMenus
new ExpectedTextMenuItem("R&eattach...", false, false ),
new ExpectedTextMenuItem("&Forget", false, false ),
new ExpectedTextMenuItem("Destr&oy...", false, false ),
//new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedSeparator(),
new ExpectedTextMenuItem("P&roperties", false, false )
};
@ -1319,7 +1319,7 @@ namespace XenAdminTests.TabsAndMenus
new ExpectedTextMenuItem("R&eattach...", false, false ),
new ExpectedTextMenuItem("&Forget", false, false ),
new ExpectedTextMenuItem("Destr&oy...", false, false ),
//new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedSeparator(),
new ExpectedTextMenuItem("P&roperties", false, false )
};
@ -1437,7 +1437,7 @@ namespace XenAdminTests.TabsAndMenus
new ExpectedTextMenuItem("R&eattach...", false, false ),
new ExpectedTextMenuItem("&Forget", false, false ),
new ExpectedTextMenuItem("Destr&oy...", false, false ),
//new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedSeparator(),
new ExpectedTextMenuItem("P&roperties", false, false )
};
@ -1548,7 +1548,7 @@ namespace XenAdminTests.TabsAndMenus
new ExpectedTextMenuItem("R&eattach...", false, false ),
new ExpectedTextMenuItem("&Forget", false, false ),
new ExpectedTextMenuItem("Destr&oy...", false, false ),
//new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedSeparator(),
new ExpectedTextMenuItem("P&roperties", false, false )
};
@ -1689,7 +1689,7 @@ namespace XenAdminTests.TabsAndMenus
new ExpectedTextMenuItem("R&eattach...", false, false ),
new ExpectedTextMenuItem("&Forget", false, false ),
new ExpectedTextMenuItem("Destr&oy...", false, false ),
//new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedSeparator(),
new ExpectedTextMenuItem("P&roperties", false, false )
};
@ -1815,7 +1815,7 @@ namespace XenAdminTests.TabsAndMenus
new ExpectedTextMenuItem("R&eattach...", false, false ),
new ExpectedTextMenuItem("&Forget", false, false ),
new ExpectedTextMenuItem("Destr&oy...", false, false ),
//new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedSeparator(),
new ExpectedTextMenuItem("P&roperties", false, false )
};
@ -1951,7 +1951,7 @@ namespace XenAdminTests.TabsAndMenus
new ExpectedTextMenuItem("R&eattach...", false, false ),
new ExpectedTextMenuItem("&Forget", false, false ),
new ExpectedTextMenuItem("Destr&oy...", false, false ),
//new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedTextMenuItem("&Convert SR...", false, false ),
new ExpectedSeparator(),
new ExpectedTextMenuItem("P&roperties", false, false )
};