Greg Sheremeta has uploaded a new change for review. Change subject: webadmin: corrected new/remove visibility rules based on left-pane tree selection. ......................................................................
webadmin: corrected new/remove visibility rules based on left-pane tree selection. When a specific item (for example, an actual host -- not "Hosts") is selected in the left-pane tree, we need to hide all flavors of the "new" and "remove" buttons / context menu items. Change-Id: I846346e683db7210753c4e85426a210195509835 Bug-Url: https://bugzilla.redhat.com/858952 Signed-off-by: Greg Sheremeta <gsher...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java 4 files changed, 36 insertions(+), 18 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/82/17882/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java index cd50e1a..e74544c 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterListModel.java @@ -850,6 +850,7 @@ getNewCommand().setIsAvailable(isAvailable); getRemoveCommand().setIsAvailable(isAvailable); + getForceRemoveCommand().setIsAvailable(isAvailable); } @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java index ca78486..c18f58e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/NetworkListModel.java @@ -239,6 +239,13 @@ getEditCommand().setIsExecutionAllowed(selectedItems.size() == 1); getRemoveCommand().setIsExecutionAllowed(selectedItems.size() > 0 && !anyEngine); + + // System tree dependent actions. + boolean isAvailable = + !(getSystemTreeSelectedItem() != null && getSystemTreeSelectedItem().getType() == SystemTreeItemType.Network); + + getNewCommand().setIsAvailable(isAvailable); + getRemoveCommand().setIsAvailable(isAvailable); } @Override diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java index 0a71091..825a614 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java @@ -1140,6 +1140,7 @@ getNewDomainCommand().setIsAvailable(isAvailable); getRemoveCommand().setIsAvailable(isAvailable); + getDestroyCommand().setIsAvailable(isAvailable); } private boolean isEditAvailable(StorageDomain storageDomain) { @@ -2233,7 +2234,7 @@ private UICommand createCancelCommand(String commandName) { UICommand command; - command = new UICommand(commandName, this); //$NON-NLS-1$ + command = new UICommand(commandName, this); command.setTitle(ConstantsManager.getInstance().getConstants().cancel()); command.setIsCancel(true); return command; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java index f94bcff..6166ecb 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/volumes/VolumeListModel.java @@ -38,6 +38,7 @@ import org.ovirt.engine.ui.uicommonweb.models.ISupportSystemTreeContext; import org.ovirt.engine.ui.uicommonweb.models.ListWithDetailsModel; import org.ovirt.engine.ui.uicommonweb.models.SystemTreeItemModel; +import org.ovirt.engine.ui.uicommonweb.models.SystemTreeItemType; import org.ovirt.engine.ui.uicommonweb.models.configure.PermissionListModel; import org.ovirt.engine.ui.uicommonweb.models.gluster.VolumeBrickListModel; import org.ovirt.engine.ui.uicommonweb.models.gluster.VolumeEventListModel; @@ -339,28 +340,36 @@ getStartCommand().setIsExecutionAllowed(false); getRebalanceCommand().setIsExecutionAllowed(false); getOptimizeForVirtStoreCommand().setIsExecutionAllowed(false); - return; } + else { + getRemoveVolumeCommand().setIsExecutionAllowed(true); + getStopCommand().setIsExecutionAllowed(true); + getStartCommand().setIsExecutionAllowed(true); + getRebalanceCommand().setIsExecutionAllowed(true); + getOptimizeForVirtStoreCommand().setIsExecutionAllowed(true); - getRemoveVolumeCommand().setIsExecutionAllowed(true); - getStopCommand().setIsExecutionAllowed(true); - getStartCommand().setIsExecutionAllowed(true); - getRebalanceCommand().setIsExecutionAllowed(true); - getOptimizeForVirtStoreCommand().setIsExecutionAllowed(true); - - for (GlusterVolumeEntity volume : Linq.<GlusterVolumeEntity> cast(getSelectedItems())) - { - if (volume.getStatus() == GlusterStatus.UP) + for (GlusterVolumeEntity volume : Linq.<GlusterVolumeEntity> cast(getSelectedItems())) { - getRemoveVolumeCommand().setIsExecutionAllowed(false); - getStartCommand().setIsExecutionAllowed(false); - } - else if (volume.getStatus() == GlusterStatus.DOWN) - { - getStopCommand().setIsExecutionAllowed(false); - getRebalanceCommand().setIsExecutionAllowed(false); + if (volume.getStatus() == GlusterStatus.UP) + { + getRemoveVolumeCommand().setIsExecutionAllowed(false); + getStartCommand().setIsExecutionAllowed(false); + } + else if (volume.getStatus() == GlusterStatus.DOWN) + { + getStopCommand().setIsExecutionAllowed(false); + getRebalanceCommand().setIsExecutionAllowed(false); + } } } + + // System tree dependent actions. + boolean isAvailable = + !(getSystemTreeSelectedItem() != null && getSystemTreeSelectedItem().getType() == SystemTreeItemType.Volume); + + getCreateVolumeCommand().setIsAvailable(isAvailable); + getRemoveVolumeCommand().setIsAvailable(isAvailable); + } private void cancel() { -- To view, visit http://gerrit.ovirt.org/17882 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I846346e683db7210753c4e85426a210195509835 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Sheremeta <gsher...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
