Daniel Erez has uploaded a new change for review. Change subject: webadmin: disks tab - fix type selection after sign out ......................................................................
webadmin: disks tab - fix type selection after sign out MainTabDiskView -> use CommonModelManager singleton instance instead of saving it as a class member (needed for fixing disk type selection after signing out). Change-Id: I11b1489db03608fddf1aa24fa6664f6c3ab5abb3 Bug-Url: https://bugzilla.redhat.com/1073574 Signed-off-by: Daniel Erez <[email protected]> --- M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDiskView.java 1 file changed, 6 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/38/25538/1 diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDiskView.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDiskView.java index acbede1..e68eaae 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDiskView.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/MainTabDiskView.java @@ -9,7 +9,6 @@ import org.ovirt.engine.ui.common.widget.uicommon.disks.DisksViewColumns; import org.ovirt.engine.ui.common.widget.uicommon.disks.DisksViewRadioGroup; import org.ovirt.engine.ui.uicommonweb.UICommand; -import org.ovirt.engine.ui.uicommonweb.models.CommonModel; import org.ovirt.engine.ui.uicommonweb.models.EntityModel; import org.ovirt.engine.ui.uicommonweb.models.disks.DiskListModel; import org.ovirt.engine.ui.uicompat.Event; @@ -39,7 +38,6 @@ SimplePanel tablePanel; private final ApplicationConstants constants; - private final CommonModel commonModel; private DisksViewRadioGroup disksViewRadioGroup; @Inject @@ -47,7 +45,6 @@ super(modelProvider); this.constants = constants; - this.commonModel = CommonModelManager.instance(); ViewIdHandler.idHandler.generateAndSetIds(this); initTableColumns(); initTableButtons(); @@ -69,7 +66,7 @@ public void eventRaised(Event ev, Object sender, EventArgs args) { EntityModel diskViewType = (EntityModel) sender; disksViewRadioGroup.setDiskStorageType((DiskStorageType) diskViewType.getEntity()); - if (commonModel.getSelectedItem() instanceof DiskListModel) { + if (CommonModelManager.instance().getSelectedItem() instanceof DiskListModel) { onDiskViewTypeChanged(); } } @@ -241,8 +238,8 @@ String diskTypeClause = diskTypePostfix != null ? diskTypeSearchPrefix + diskTypePostfix : empty; - String inputSearchString = commonModel.getSearchString().trim(); - String inputSearchStringPrefix = commonModel.getSearchStringPrefix().trim(); + String inputSearchString = CommonModelManager.instance().getSearchString().trim(); + String inputSearchStringPrefix = CommonModelManager.instance().getSearchStringPrefix().trim(); if (!inputSearchString.isEmpty() && inputSearchStringPrefix.isEmpty()) { int indexOfColon = inputSearchString.indexOf(colon); @@ -279,12 +276,12 @@ else { searchString = searchConjunctionAnd + inputSearchString; } - commonModel.setSearchStringPrefix(searchStringPrefix); - commonModel.setSearchString(searchString); + CommonModelManager.instance().setSearchStringPrefix(searchStringPrefix); + CommonModelManager.instance().setSearchString(searchString); getTable().getSelectionModel().clear(); getMainModel().setItems(null); - getMainModel().setSearchString(commonModel.getEffectiveSearchString()); + getMainModel().setSearchString(CommonModelManager.instance().getEffectiveSearchString()); getMainModel().search(); } } -- To view, visit http://gerrit.ovirt.org/25538 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I11b1489db03608fddf1aa24fa6664f6c3ab5abb3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
