Lior Vernia has uploaded a new change for review. Change subject: webadmin: Added Data Centers node in system tree ......................................................................
webadmin: Added Data Centers node in system tree Added in between System node and specific Data Center nodes, as preparation for another category under the System node: Providers. Change-Id: I26665a6bb2d12b0e19567002d685d9821d15f53c Signed-off-by: Lior Vernia <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeItemType.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/tree/SystemTree.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/tree/SystemTreeItemCell.java 5 files changed, 21 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/59/14759/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java index b015cd0..0ed37f0 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java @@ -506,7 +506,8 @@ // Update items availability depending on system tree selection. dataCenterList.setIsAvailable(model.getType() == SystemTreeItemType.DataCenter - || model.getType() == SystemTreeItemType.Storage || model.getType() == SystemTreeItemType.System); + || model.getType() == SystemTreeItemType.Storage || model.getType() == SystemTreeItemType.System + || model.getType() == SystemTreeItemType.DataCenters); clusterList.setIsAvailable(model.getType() == SystemTreeItemType.DataCenter || model.getType() == SystemTreeItemType.Clusters || model.getType() == SystemTreeItemType.Cluster @@ -636,6 +637,7 @@ } else { switch (model.getType()) { + case DataCenters: case DataCenter: setSelectedItem(dataCenterList); break; @@ -1011,6 +1013,11 @@ switch (model.getType()) { + case DataCenters: + if (dataCenterList.isSearchStringMatch(source)) { + prefix.argvalue = "DataCenter:"; //$NON-NLS-1$ + } + break; case DataCenter: { if (dataCenterList.isSearchStringMatch(source)) { diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeItemType.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeItemType.java index 25d3994..81dd11f 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeItemType.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/SystemTreeItemType.java @@ -4,6 +4,7 @@ public enum SystemTreeItemType { System, + DataCenters, DataCenter, Storages, Storage, 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 b9ab816..c26f4eb 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 @@ -395,6 +395,13 @@ systemItem.setIsSelected(true); systemItem.setTitle(ConstantsManager.getInstance().getConstants().systemTitle()); + // Add Data Centers node under System + SystemTreeItemModel dataCentersItem = new SystemTreeItemModel(); + dataCentersItem.setType(SystemTreeItemType.DataCenters); + dataCentersItem.setTitle(ConstantsManager.getInstance().getConstants().dataCentersTitle()); + systemItem.getChildren().add(dataCentersItem); + + // Populate everything under Data Centers for (VdcQueryReturnValue returnValue : result.getReturnValues()) { ++count; @@ -409,7 +416,7 @@ dataCenterItem.setApplicationMode(ApplicationMode.VirtOnly); dataCenterItem.setTitle(getDataCenters().get(count).getname()); dataCenterItem.setEntity(getDataCenters().get(count)); - systemItem.getChildren().add(dataCenterItem); + dataCentersItem.getChildren().add(dataCenterItem); SystemTreeItemModel storagesItem = new SystemTreeItemModel(); storagesItem.setType(SystemTreeItemType.Storages); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/tree/SystemTree.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/tree/SystemTree.java index c37c8fa..ad49f0e 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/tree/SystemTree.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/tree/SystemTree.java @@ -26,7 +26,7 @@ public class SystemTree extends AbstractActionStackPanelItem<SystemTreeModelProvider, SystemTreeModel, CellTree> { private static final int ALL_LEVELS = Integer.MAX_VALUE; - private static final int ITEM_LEVEL = 2; + private static final int ITEM_LEVEL = 3; interface WidgetUiBinder extends UiBinder<Widget, SystemTree> { WidgetUiBinder uiBinder = GWT.create(WidgetUiBinder.class); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/tree/SystemTreeItemCell.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/tree/SystemTreeItemCell.java index c0e6b99..98f69cb 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/tree/SystemTreeItemCell.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/tree/SystemTreeItemCell.java @@ -36,6 +36,9 @@ case DataCenter: imageResource = applicationResources.dataCenterImage(); break; + case DataCenters: + imageResource = applicationResources.dataCenterImage(); + break; case Cluster_Gluster: imageResource = applicationResources.glusterClusterImage(); break; -- To view, visit http://gerrit.ovirt.org/14759 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I26665a6bb2d12b0e19567002d685d9821d15f53c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
