Lior Vernia has uploaded a new change for review. Change subject: webadmin: Added linking from Provider to Network ......................................................................
webadmin: Added linking from Provider to Network Added linking the other way around, from the Provider/Networks subtab to the Networks main tab. Change-Id: I326dbf7ae46d2e07a3472581af36b9dd57407862 Signed-off-by: Lior Vernia <[email protected]> --- 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/section/main/presenter/tab/provider/SubTabProviderNetworkPresenter.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderNetworkView.java 3 files changed, 37 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/24/15524/1 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 d7d7d18..39628f0 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 @@ -485,6 +485,7 @@ networkItem.setParent(networksItem); networkItem.setEntity(network); networksItem.getChildren().add(networkItem); + treeItemById.put(network.getId(), networkItem); } } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/provider/SubTabProviderNetworkPresenter.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/provider/SubTabProviderNetworkPresenter.java index 4723e40..461a6b5 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/provider/SubTabProviderNetworkPresenter.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/tab/provider/SubTabProviderNetworkPresenter.java @@ -5,12 +5,15 @@ import org.ovirt.engine.ui.common.presenter.AbstractSubTabPresenter; import org.ovirt.engine.ui.common.uicommon.model.SearchableDetailModelProvider; import org.ovirt.engine.ui.common.widget.tab.ModelBoundTabData; +import org.ovirt.engine.ui.uicommonweb.models.SystemTreeModel; import org.ovirt.engine.ui.uicommonweb.models.providers.ProviderListModel; import org.ovirt.engine.ui.uicommonweb.models.providers.ProviderNetworkListModel; import org.ovirt.engine.ui.webadmin.gin.ClientGinjector; import org.ovirt.engine.ui.webadmin.place.ApplicationPlaces; import org.ovirt.engine.ui.webadmin.section.main.presenter.tab.ProviderSelectionChangeEvent; +import org.ovirt.engine.ui.webadmin.uicommon.model.SystemTreeModelProvider; +import com.google.gwt.cell.client.FieldUpdater; import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; import com.gwtplatform.mvp.client.TabData; @@ -25,12 +28,15 @@ public class SubTabProviderNetworkPresenter extends AbstractSubTabPresenter<Provider, ProviderListModel, ProviderNetworkListModel, SubTabProviderNetworkPresenter.ViewDef, SubTabProviderNetworkPresenter.ProxyDef> { + private SystemTreeModel systemTreeModel; + @ProxyCodeSplit @NameToken(ApplicationPlaces.providerNetworkSubTabPlace) public interface ProxyDef extends TabContentProxyPlace<SubTabProviderNetworkPresenter> { } public interface ViewDef extends AbstractSubTabPresenter.ViewDef<Provider> { + void setNetworkClickHandler(FieldUpdater<Network, String> fieldUpdater); } @TabInfo(container = ProviderSubTabPanelPresenter.class) @@ -42,8 +48,9 @@ @Inject public SubTabProviderNetworkPresenter(EventBus eventBus, ViewDef view, ProxyDef proxy, PlaceManager placeManager, - SearchableDetailModelProvider<Network, ProviderListModel, ProviderNetworkListModel> modelProvider) { + SearchableDetailModelProvider<Network, ProviderListModel, ProviderNetworkListModel> modelProvider, SystemTreeModelProvider systemTreeModelProvider) { super(eventBus, view, proxy, placeManager, modelProvider); + systemTreeModel = systemTreeModelProvider.getModel(); } @Override @@ -61,5 +68,17 @@ updateMainTabSelection(event.getSelectedItems()); } + @Override + protected void onBind() { + super.onBind(); + getView().setNetworkClickHandler(new FieldUpdater<Network, String>() { + + @Override + public void update(int index, Network network, String value) { + systemTreeModel.setSelectedItem(network.getId()); + } + }); + } + } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderNetworkView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderNetworkView.java index ffb3d74..bb9880f 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderNetworkView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/provider/SubTabProviderNetworkView.java @@ -5,6 +5,7 @@ import org.ovirt.engine.core.common.businessentities.Provider; import org.ovirt.engine.core.common.businessentities.network.Network; import org.ovirt.engine.ui.common.uicommon.model.SearchableDetailModelProvider; +import org.ovirt.engine.ui.common.widget.table.column.LinkColumnWithTooltip; import org.ovirt.engine.ui.common.widget.table.column.TextColumnWithTooltip; import org.ovirt.engine.ui.uicommonweb.UICommand; import org.ovirt.engine.ui.uicommonweb.models.providers.ProviderListModel; @@ -15,10 +16,14 @@ import org.ovirt.engine.ui.webadmin.section.main.view.AbstractSubTabTableView; import org.ovirt.engine.ui.webadmin.widget.action.WebAdminButtonDefinition; +import com.google.gwt.cell.client.FieldUpdater; + public class SubTabProviderNetworkView extends AbstractSubTabTableView<Provider, Network, ProviderListModel, ProviderNetworkListModel> implements SubTabProviderNetworkPresenter.ViewDef { private final ApplicationConstants constants; + + private LinkColumnWithTooltip<Network> nameColumn; @Inject public SubTabProviderNetworkView(SearchableDetailModelProvider<Network, ProviderListModel, ProviderNetworkListModel> modelProvider, @@ -33,13 +38,12 @@ void initTable() { getTable().enableColumnResizing(); - TextColumnWithTooltip<Network> nameColumn = - new TextColumnWithTooltip<Network>() { - @Override - public String getValue(Network object) { - return object.getName(); - } - }; + nameColumn = new LinkColumnWithTooltip<Network>() { + @Override + public String getValue(Network object) { + return object.getName(); + } + }; getTable().addColumn(nameColumn, constants.nameNetwork(), "200px"); //$NON-NLS-1$ TextColumnWithTooltip<Network> externalIdColumn = @@ -73,4 +77,9 @@ }); } + @Override + public void setNetworkClickHandler(FieldUpdater<Network, String> fieldUpdater) { + nameColumn.setFieldUpdater(fieldUpdater); + } + } -- To view, visit http://gerrit.ovirt.org/15524 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I326dbf7ae46d2e07a3472581af36b9dd57407862 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
