Alexander Wels has uploaded a new change for review. Change subject: userportal,webadmin: clear subtab item ......................................................................
userportal,webadmin: clear subtab item - When unselecting a main tab grid item, the active detail model was not cleared. This caused the detail model to not be refreshed when re-selecting the item in the main grid. This patch clears the active detail model when unselecting the item in the main tab grid. Change-Id: I5309207cb8153f7b1d5c8e53a117dd8440a98698 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1131147 Signed-off-by: Alexander Wels <aw...@redhat.com> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/AbstractSubTabPresenter.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/model/DetailModelProvider.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/model/DetailTabModelProvider.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/model/SearchableDetailTabModelProvider.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/model/UserPortalDetailModelProvider.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/model/UserPortalSearchableDetailModelProvider.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterTemplateInfoPanel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterVmInfoPanel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportTemplatePopupView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmPopupView.java 10 files changed, 55 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/26/32826/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/AbstractSubTabPresenter.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/AbstractSubTabPresenter.java index c1c6c1b..a7f5fbd 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/AbstractSubTabPresenter.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/AbstractSubTabPresenter.java @@ -119,9 +119,15 @@ // Notify model provider that the tab has been revealed modelProvider.onSubTabSelected(); - if (getTable() != null) { - getTable().setLoadingState(LoadingState.LOADING); - } +// if (getTable() != null) { +// getTable().setLoadingState(LoadingState.LOADING); +// } + } + + @Override + protected void onHide() { + super.onHide(); + modelProvider.onSubTabDeselected(); } @Override diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/model/DetailModelProvider.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/model/DetailModelProvider.java index bcf3179..646efc0 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/model/DetailModelProvider.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/model/DetailModelProvider.java @@ -20,4 +20,9 @@ */ void onSubTabSelected(); + /** + * Notifies main model that the corresponding sub tab has been un-selected. + */ + void onSubTabDeselected(); + } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/model/DetailTabModelProvider.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/model/DetailTabModelProvider.java index 2c5b510..e53af18 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/model/DetailTabModelProvider.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/model/DetailTabModelProvider.java @@ -42,4 +42,8 @@ getMainModel().setActiveDetailModel(getModel()); } + @Override + public void onSubTabDeselected() { + getMainModel().setActiveDetailModel(null); + } } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/model/SearchableDetailTabModelProvider.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/model/SearchableDetailTabModelProvider.java index e544d32..57b7943 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/model/SearchableDetailTabModelProvider.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/model/SearchableDetailTabModelProvider.java @@ -44,4 +44,8 @@ getMainModel().setActiveDetailModel(getModel()); } + @Override + public void onSubTabDeselected() { + getMainModel().setActiveDetailModel(null); + } } diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/model/UserPortalDetailModelProvider.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/model/UserPortalDetailModelProvider.java index c7592a1..992a71a 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/model/UserPortalDetailModelProvider.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/model/UserPortalDetailModelProvider.java @@ -49,4 +49,9 @@ getParentModel().setActiveDetailModel(getModel()); } + @Override + public void onSubTabDeselected() { + getParentModel().setActiveDetailModel(null); + } + } diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/model/UserPortalSearchableDetailModelProvider.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/model/UserPortalSearchableDetailModelProvider.java index 4b7e7dc..ec96574 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/model/UserPortalSearchableDetailModelProvider.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/model/UserPortalSearchableDetailModelProvider.java @@ -53,4 +53,9 @@ getParentModel().setActiveDetailModel(getModel()); } + @Override + public void onSubTabDeselected() { + getParentModel().setActiveDetailModel(null); + } + } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterTemplateInfoPanel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterTemplateInfoPanel.java index 56bf7f2..0bf9bc1 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterTemplateInfoPanel.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterTemplateInfoPanel.java @@ -10,9 +10,9 @@ import org.ovirt.engine.ui.uicommonweb.models.templates.TemplateListModel; import org.ovirt.engine.ui.uicommonweb.models.vms.ImportEntityData; import org.ovirt.engine.ui.uicommonweb.models.vms.ImportTemplateData; +import org.ovirt.engine.ui.webadmin.section.main.view.popup.storage.backup.ImportTemplateGeneralSubTabView; import com.google.gwt.user.client.ui.ScrollPanel; -import org.ovirt.engine.ui.webadmin.section.main.view.popup.storage.backup.ImportTemplateGeneralSubTabView; public class RegisterTemplateInfoPanel extends RegisterEntityInfoPanel { @@ -58,6 +58,10 @@ @Override public void onSubTabSelected() { } + + @Override + public void onSubTabDeselected() { + } }; generalView = new ImportTemplateGeneralSubTabView(modelProvider, constants); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterVmInfoPanel.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterVmInfoPanel.java index 09a1398..113e57a 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterVmInfoPanel.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/RegisterVmInfoPanel.java @@ -1,6 +1,9 @@ package org.ovirt.engine.ui.webadmin.section.main.view.popup.storage; -import com.google.gwt.user.client.ui.ScrollPanel; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import org.ovirt.engine.core.common.businessentities.VM; import org.ovirt.engine.ui.common.uicommon.model.DetailModelProvider; import org.ovirt.engine.ui.uicommonweb.models.storage.RegisterEntityModel; @@ -10,9 +13,7 @@ import org.ovirt.engine.ui.uicommonweb.models.vms.VmListModel; import org.ovirt.engine.ui.webadmin.section.main.view.popup.storage.backup.ImportVmGeneralSubTabView; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import com.google.gwt.user.client.ui.ScrollPanel; public class RegisterVmInfoPanel extends RegisterEntityInfoPanel { @@ -62,6 +63,10 @@ @Override public void onSubTabSelected() { } + + @Override + public void onSubTabDeselected() { + } }; generalView = new ImportVmGeneralSubTabView(modelProvider, constants); } diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportTemplatePopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportTemplatePopupView.java index 6114c5a..8796e20 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportTemplatePopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportTemplatePopupView.java @@ -148,6 +148,10 @@ @Override public void onSubTabSelected() { } + + @Override + public void onSubTabDeselected() { + } }; generalView = new ImportTemplateGeneralSubTabView(modelProvider, constants); generalPanel.add(generalView); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmPopupView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmPopupView.java index 11ab9f1..4756f29 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmPopupView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/storage/backup/ImportVmPopupView.java @@ -17,8 +17,8 @@ import org.ovirt.engine.ui.common.uicommon.model.DetailModelProvider; import org.ovirt.engine.ui.common.view.popup.AbstractModelBoundPopupView; import org.ovirt.engine.ui.common.widget.dialog.SimpleDialogPanel; -import org.ovirt.engine.ui.common.widget.editor.ListModelObjectCellTable; import org.ovirt.engine.ui.common.widget.editor.ListModelListBoxEditor; +import org.ovirt.engine.ui.common.widget.editor.ListModelObjectCellTable; import org.ovirt.engine.ui.common.widget.renderer.EnumRenderer; import org.ovirt.engine.ui.common.widget.renderer.NullSafeRenderer; import org.ovirt.engine.ui.common.widget.renderer.StorageDomainFreeSpaceRenderer; @@ -203,6 +203,10 @@ @Override public void onSubTabSelected() { } + + @Override + public void onSubTabDeselected() { + } }; generalView = new ImportVmGeneralSubTabView(modelProvider, constants); generalPanel.add(generalView); -- To view, visit http://gerrit.ovirt.org/32826 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5309207cb8153f7b1d5c8e53a117dd8440a98698 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexander Wels <aw...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
