Merge pull request #835 from MihaelaStoica/CP-15576

CP-15576: Hide containers options that aren't available for Windows S…
This commit is contained in:
Stephen Turner 2016-02-14 22:15:23 +00:00
commit fe29a0bb7d
2 changed files with 2 additions and 2 deletions

View File

@ -63,7 +63,7 @@ namespace XenAdmin.Commands
private static bool CanExecute(DockerContainer dockerContainer) private static bool CanExecute(DockerContainer dockerContainer)
{ {
return dockerContainer.power_state == vm_power_state.Running; return dockerContainer.power_state == vm_power_state.Running && !dockerContainer.Parent.IsWindows;
} }
protected override void ExecuteCore(SelectedItemCollection selection) protected override void ExecuteCore(SelectedItemCollection selection)

View File

@ -1384,7 +1384,7 @@ namespace XenAdmin
ShowTab(TabPagePhysicalStorage, !multi && !SearchMode && ((isHostSelected && isHostLive) || isPoolSelected)); ShowTab(TabPagePhysicalStorage, !multi && !SearchMode && ((isHostSelected && isHostLive) || isPoolSelected));
ShowTab(TabPageNetwork, !multi && !SearchMode && (isVMSelected || (isHostSelected && isHostLive) || isPoolSelected)); ShowTab(TabPageNetwork, !multi && !SearchMode && (isVMSelected || (isHostSelected && isHostLive) || isPoolSelected));
ShowTab(TabPageNICs, !multi && !SearchMode && ((isHostSelected && isHostLive))); ShowTab(TabPageNICs, !multi && !SearchMode && ((isHostSelected && isHostLive)));
ShowTab(TabPageDockerProcess, !multi && !SearchMode && isDockerContainerSelected); ShowTab(TabPageDockerProcess, !multi && !SearchMode && isDockerContainerSelected && !(SelectionManager.Selection.First as DockerContainer).Parent.IsWindows);
ShowTab(TabPageDockerDetails, !multi && !SearchMode && isDockerContainerSelected); ShowTab(TabPageDockerDetails, !multi && !SearchMode && isDockerContainerSelected);
bool isPoolOrLiveStandaloneHost = isPoolSelected || (isHostSelected && isHostLive && selectionPool == null); bool isPoolOrLiveStandaloneHost = isPoolSelected || (isHostSelected && isHostLive && selectionPool == null);