Lior Vernia has uploaded a new change for review. Change subject: webadmin: Set default DC for import by tree selection ......................................................................
webadmin: Set default DC for import by tree selection Instead of always choosing the first DC in the list as the default for an import operation, consider the item selected in the system tree and see if it implies a specific context for the import operation. Change-Id: Ib0fc87737b151c6e39f2545e39516023b0851111 Bug-Url: https://bugzilla.redhat.com/1048726 Signed-off-by: Lior Vernia <lver...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/ImportNetworksModel.java 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/32/25732/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/ImportNetworksModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/ImportNetworksModel.java index e373da0..e35f5ed 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/ImportNetworksModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/networks/ImportNetworksModel.java @@ -29,9 +29,12 @@ import org.ovirt.engine.ui.uicommonweb.UICommand; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.help.HelpTag; +import org.ovirt.engine.ui.uicommonweb.models.CommonModel; import org.ovirt.engine.ui.uicommonweb.models.ListModel; import org.ovirt.engine.ui.uicommonweb.models.Model; import org.ovirt.engine.ui.uicommonweb.models.SearchableListModel; +import org.ovirt.engine.ui.uicommonweb.models.SystemTreeItemModel; +import org.ovirt.engine.ui.uicommonweb.models.SystemTreeItemType; import org.ovirt.engine.ui.uicommonweb.models.providers.ExternalNetwork; import org.ovirt.engine.ui.uicompat.ConstantsManager; import org.ovirt.engine.ui.uicompat.Event; @@ -46,6 +49,8 @@ private static final String CMD_CANCEL = "Cancel"; //$NON-NLS-1$ private final SearchableListModel sourceListModel; + + private final StoragePool treeSelectedDc; private final ListModel providers = new ListModel(); private final ListModel providerNetworks = new ListModel(); @@ -92,6 +97,11 @@ cancelCommand.setTitle(ConstantsManager.getInstance().getConstants().cancel()); cancelCommand.setIsCancel(true); getCommands().add(cancelCommand); + + SystemTreeItemModel treeSelectedDcItem = + SystemTreeItemModel.findAncestor(SystemTreeItemType.DataCenter, + (SystemTreeItemModel) CommonModel.getInstance().getSystemTree().getSelectedItem()); + treeSelectedDc = (treeSelectedDcItem == null) ? null : (StoragePool) treeSelectedDcItem.getEntity(); providers.getSelectedItemChangedEvent().addListener(new IEventListener() { @@ -149,7 +159,9 @@ } } externalNetwork.getDataCenters().setItems(availableDataCenters); - externalNetwork.getDataCenters().setSelectedItem(Linq.firstOrDefault(availableDataCenters)); + externalNetwork.getDataCenters() + .setSelectedItem(attachedDataCenters.contains(treeSelectedDc) ? Linq.firstOrDefault(availableDataCenters) + : treeSelectedDc); items.add(externalNetwork); } -- To view, visit http://gerrit.ovirt.org/25732 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib0fc87737b151c6e39f2545e39516023b0851111 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Lior Vernia <lver...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
