Alexander Wels has uploaded a new change for review. Change subject: webadmin: Application continue polling after logout ......................................................................
webadmin: Application continue polling after logout - Fixed queries to BookMarks not stopping when logging out. - Fixed queries to RoleListModel not stopping when logging out. - Fixed queries to SystemPermissionListModel not stopping when logging out. - Removed feature to hide error popups when logging out as they are no longer needed. Change-Id: Ibd2718649ab4031e6ff2b0d0e6c449f53164ff9f Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=888492 Signed-off-by: Alexander Wels <[email protected]> --- M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/system/BaseApplicationInit.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/system/ErrorPopupManager.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/FrontendFailureEventListener.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/model/CommonModelManager.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/CommonModel.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/presenter/LoginSectionPresenter.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/presenter/LoginSectionPresenter.java 7 files changed, 20 insertions(+), 44 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/95/10895/1 diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/system/BaseApplicationInit.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/system/BaseApplicationInit.java index 37de2e3..c35257d 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/system/BaseApplicationInit.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/system/BaseApplicationInit.java @@ -93,7 +93,6 @@ @Override public void onLogout() { user.onUserLogout(); - frontendFailureEventListener.hide(); } protected void performLogin(T loginModel) { diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/system/ErrorPopupManager.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/system/ErrorPopupManager.java index 085257c..6ca1427 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/system/ErrorPopupManager.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/system/ErrorPopupManager.java @@ -16,17 +16,10 @@ private final EventBus eventBus; private final ErrorPopupPresenterWidget errorPopup; - private boolean showPopups; - @Inject public ErrorPopupManager(EventBus eventBus, ErrorPopupPresenterWidget errorPopup) { this.eventBus = eventBus; this.errorPopup = errorPopup; - this.showPopups = true; - } - - public void setShowPopups(boolean showPopups) { - this.showPopups = showPopups; } @Override @@ -35,10 +28,8 @@ } public void show(String errorMessage) { - if (showPopups) { - errorPopup.prepare(errorMessage); - RevealRootPopupContentEvent.fire(this, errorPopup); - } + errorPopup.prepare(errorMessage); + RevealRootPopupContentEvent.fire(this, errorPopup); } public void hide(){ diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/FrontendFailureEventListener.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/FrontendFailureEventListener.java index 6e2c770..eba5ab7 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/FrontendFailureEventListener.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/FrontendFailureEventListener.java @@ -29,8 +29,4 @@ errorPopupManager.show(MESSAGES.uiCommonFrontendFailure(ErrorMessageFormatter.formatMessages(failureArgs.getMessages()))); } } - - public void hide() { - errorPopupManager.hide(); - } } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/model/CommonModelManager.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/model/CommonModelManager.java index 26d4776..b4ca92a 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/model/CommonModelManager.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/model/CommonModelManager.java @@ -41,7 +41,6 @@ loginModel.resetAfterLogout(); user.onUserLogout(); - frontendFailureEventListener.hide(); } }); } 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 8af85d5..229a45e 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 @@ -421,7 +421,7 @@ getTagList().getSelectedItems() != null ? Linq.<TagModel> Cast(getTagList().getSelectedItems()) : new ArrayList<TagModel>(); - setHasSelectedTags(getSelectedItem() != null && selectedTags.size() > 0); + setHasSelectedTags(getSelectedItem() != null && selectedTags.size() > 0); } private void TagListModel_SelectedItemsChanged(Object sender, EventArgs e) @@ -559,7 +559,7 @@ storage_domains storage = (storage_domains) model.getEntity(); isDataStorage = storage.getstorage_domain_type() == StorageDomainType.Data - || storage.getstorage_domain_type() == StorageDomainType.Master; + || storage.getstorage_domain_type() == StorageDomainType.Master; } diskList.setIsAvailable(model.getType() == SystemTreeItemType.DataCenter @@ -731,6 +731,9 @@ getEventList().EnsureAsyncSearchStopped(); getAlertList().EnsureAsyncSearchStopped(); getTaskList().EnsureAsyncSearchStopped(); + getBookmarkList().EnsureAsyncSearchStopped(); + getRoleListModel().EnsureAsyncSearchStopped(); + getSystemPermissionListModel().EnsureAsyncSearchStopped(); if (Frontend.getIsUserLoggedIn()) { @@ -1073,14 +1076,14 @@ prefix.argvalue = "Network: datacenter = " + model.getTitle(); //$NON-NLS-1$ } } - break; + break; case Clusters: { if (clusterList.IsSearchStringMatch(source)) { prefix.argvalue = "Cluster: datacenter.name = " + model.getParent().getTitle(); //$NON-NLS-1$ } } - break; + break; case Cluster: case Cluster_Gluster: { @@ -1117,14 +1120,14 @@ prefix.argvalue = "Network: Cluster_network.cluster_name = " + model.getTitle(); //$NON-NLS-1$ } } - break; + break; case Hosts: { if (hostList.IsSearchStringMatch(source)) { prefix.argvalue = "Host: cluster = " + model.getParent().getTitle(); //$NON-NLS-1$ } } - break; + break; case Host: { if (hostList.IsSearchStringMatch(source)) { @@ -1151,7 +1154,7 @@ prefix.argvalue = "Network: Host_network.host_name = " + model.getTitle(); //$NON-NLS-1$ } } - break; + break; case Volumes: { if (volumeList.IsSearchStringMatch(source)) @@ -1159,7 +1162,7 @@ prefix.argvalue = "Volume: cluster = " + model.getParent().getTitle(); //$NON-NLS-1$ } } - break; + break; case Volume: { if (volumeList.IsSearchStringMatch(source)) @@ -1183,14 +1186,14 @@ prefix.argvalue = "Events: volume.name = " + model.getTitle(); //$NON-NLS-1$ } } - break; + break; case Storages: { if (storageList.IsSearchStringMatch(source)) { prefix.argvalue = "Storage: datacenter = " + model.getParent().getTitle(); //$NON-NLS-1$ } } - break; + break; case Storage: { if (dataCenterList.IsSearchStringMatch(source)) { @@ -1225,28 +1228,28 @@ prefix.argvalue = "Disk: storages.name = " + model.getTitle(); //$NON-NLS-1$ } } - break; + break; case Templates: { if (templateList.IsSearchStringMatch(source)) { prefix.argvalue = "Template: datacenter = " + model.getParent().getTitle(); //$NON-NLS-1$ } } - break; + break; case VMs: { if (vmList.IsSearchStringMatch(source)) { prefix.argvalue = "Vms: cluster = " + model.getParent().getTitle(); //$NON-NLS-1$ } } - break; + break; case Networks: { if (networkList.IsSearchStringMatch(source)) { prefix.argvalue = "Network: datacenter = " + model.getParent().getTitle(); //$NON-NLS-1$ } } - break; + break; case Network: { if (networkList.IsSearchStringMatch(source)) { @@ -1269,7 +1272,7 @@ prefix.argvalue = "Template : Vnic.network_name = " + model.getTitle() + " datacenter = " + model.getParent().getTitle(); //$NON-NLS-1$ //$NON-NLS-2$ } } - break; + break; } prefix.argvalue = prefix.argvalue + " "; //$NON-NLS-1$ diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/presenter/LoginSectionPresenter.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/presenter/LoginSectionPresenter.java index 4efbdcf..eb23841 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/presenter/LoginSectionPresenter.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/login/presenter/LoginSectionPresenter.java @@ -51,17 +51,11 @@ @Override protected void onReveal() { super.onReveal(); - - // Disable error popups when entering login section - errorPopupManager.setShowPopups(false); } @Override protected void onHide() { super.onHide(); - - // Enable error popups when leaving login section - errorPopupManager.setShowPopups(true); } @Override diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/presenter/LoginSectionPresenter.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/presenter/LoginSectionPresenter.java index 4b7d1c9..8b8792c 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/presenter/LoginSectionPresenter.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/login/presenter/LoginSectionPresenter.java @@ -51,17 +51,11 @@ @Override protected void onReveal() { super.onReveal(); - - // Disable error popups when entering login section - errorPopupManager.setShowPopups(false); } @Override protected void onHide() { super.onHide(); - - // Enable error popups when leaving login section - errorPopupManager.setShowPopups(true); } @Override -- To view, visit http://gerrit.ovirt.org/10895 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibd2718649ab4031e6ff2b0d0e6c449f53164ff9f Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexander Wels <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
