Kanagaraj M has uploaded a new change for review. Change subject: webadmin: ApplicationMode - fix system tree filtering ......................................................................
webadmin: ApplicationMode - fix system tree filtering - DataCenters, Providers and Provider type nodes will be visible in system tree only if the ApplicationMode supports Virt. - Modified the system tree filtering to add the grand child items if all immediate child items are not visible. Change-Id: I7969eab70929d8206f217a226b519b1fd14619b7 Signed-off-by: Kanagaraj M <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ApplicationModeHelper.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java 2 files changed, 12 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/58/15158/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ApplicationModeHelper.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ApplicationModeHelper.java index 106b58b..50e8af6 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ApplicationModeHelper.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/ApplicationModeHelper.java @@ -65,11 +65,12 @@ list.add(item); } } - if (list.size() == 1 - && list.size() == systemItem.getChildren().size() - && (systemItem.getChildren().get(0).getApplicationMode().getValue() & ApplicationModeHelper.getUiMode() - .getValue()) == 0) { - systemItem.setChildren(systemItem.getChildren().get(0).getChildren()); + if (list.size() > 0 && list.size() == systemItem.getChildren().size()) { + List<SystemTreeItemModel> childItems = new ArrayList<SystemTreeItemModel>(); + for (SystemTreeItemModel item : list) { + childItems.addAll(item.getChildren()); + } + systemItem.setChildren(childItems); } for (SystemTreeItemModel systemTreeItemModel : list) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java index 08855c1..d4c2f39 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java @@ -7,10 +7,10 @@ import java.util.Map; import org.ovirt.engine.core.common.businessentities.Provider; -import org.ovirt.engine.core.common.businessentities.VDS; -import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.StoragePool; +import org.ovirt.engine.core.common.businessentities.VDS; +import org.ovirt.engine.core.common.businessentities.VDSGroup; import org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeEntity; import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.core.common.mode.ApplicationMode; @@ -413,7 +413,9 @@ // Add Data Centers node under System SystemTreeItemModel dataCentersItem = new SystemTreeItemModel(); dataCentersItem.setType(SystemTreeItemType.DataCenters); + dataCentersItem.setApplicationMode(ApplicationMode.VirtOnly); dataCentersItem.setTitle(ConstantsManager.getInstance().getConstants().dataCentersTitle()); + dataCentersItem.setParent(systemItem); systemItem.getChildren().add(dataCentersItem); // Populate everything under Data Centers @@ -566,6 +568,7 @@ // Add Providers node under System SystemTreeItemModel providersItem = new SystemTreeItemModel(); providersItem.setType(SystemTreeItemType.Providers); + providersItem.setApplicationMode(ApplicationMode.VirtOnly); providersItem.setTitle(ConstantsManager.getInstance().getConstants().externalProvidersTitle()); systemItem.getChildren().add(providersItem); @@ -573,6 +576,7 @@ for (Provider provider : getProviders()) { SystemTreeItemModel providerItem = new SystemTreeItemModel(); providerItem.setType(SystemTreeItemType.Provider); + providerItem.setApplicationMode(ApplicationMode.VirtOnly); providerItem.setTitle(provider.getName()); providersItem.getChildren().add(providerItem); } -- To view, visit http://gerrit.ovirt.org/15158 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7969eab70929d8206f217a226b519b1fd14619b7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Kanagaraj M <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
