Daniel Erez has uploaded a new change for review. Change subject: webadmin: sort items of vms and templates tabs under storage ......................................................................
webadmin: sort items of vms and templates tabs under storage Storage main-tab -> VMs/Templates sub-tabs: sort items on syncSearch. Change-Id: If3c63419c3cd715ec28e0b89cfd5ccd6b3c0af67 Signed-off-by: Daniel Erez <[email protected]> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageTemplateListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageVmListModel.java 2 files changed, 12 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/49/28849/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageTemplateListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageTemplateListModel.java index 109a8a9..3bba926 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageTemplateListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageTemplateListModel.java @@ -1,7 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models.storage; import java.util.ArrayList; -import java.util.List; +import java.util.Collections; import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.VmTemplate; @@ -11,6 +11,7 @@ import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.frontend.INewAsyncCallback; +import org.ovirt.engine.ui.uicommonweb.Linq; import org.ovirt.engine.ui.uicommonweb.help.HelpTag; import org.ovirt.engine.ui.uicommonweb.models.SearchableListModel; import org.ovirt.engine.ui.uicompat.ConstantsManager; @@ -83,8 +84,10 @@ public void onSuccess(Object model, Object ReturnValue) { StorageTemplateListModel templateModel = (StorageTemplateListModel) model; - templateModel.setItems((ArrayList<VmTemplate>) ((VdcQueryReturnValue) ReturnValue).getReturnValue()); - templateModel.setIsEmpty(((List) templateModel.getItems()).size() == 0); + ArrayList<VmTemplate> templates = ((VdcQueryReturnValue) ReturnValue).getReturnValue(); + Collections.sort(templates, new Linq.VmTemplateComparator()); + templateModel.setItems(templates); + templateModel.setIsEmpty(templates.size() == 0); } }; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageVmListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageVmListModel.java index 4448b86..28124ab 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageVmListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageVmListModel.java @@ -1,7 +1,7 @@ package org.ovirt.engine.ui.uicommonweb.models.storage; import java.util.ArrayList; -import java.util.List; +import java.util.Collections; import org.ovirt.engine.core.common.businessentities.StorageDomain; import org.ovirt.engine.core.common.businessentities.VM; @@ -11,6 +11,7 @@ import org.ovirt.engine.ui.frontend.AsyncQuery; import org.ovirt.engine.ui.frontend.Frontend; import org.ovirt.engine.ui.frontend.INewAsyncCallback; +import org.ovirt.engine.ui.uicommonweb.Linq; import org.ovirt.engine.ui.uicommonweb.help.HelpTag; import org.ovirt.engine.ui.uicommonweb.models.SearchableListModel; import org.ovirt.engine.ui.uicompat.ConstantsManager; @@ -83,8 +84,10 @@ public void onSuccess(Object model, Object ReturnValue) { StorageVmListModel vmModel = (StorageVmListModel) model; - vmModel.setItems((ArrayList<VM>) ((VdcQueryReturnValue) ReturnValue).getReturnValue()); - vmModel.setIsEmpty(((List) vmModel.getItems()).size() == 0); + ArrayList<VM> vms = ((VdcQueryReturnValue) ReturnValue).getReturnValue(); + Collections.sort(vms, new Linq.VmComparator()); + vmModel.setItems(vms); + vmModel.setIsEmpty(vms.size() == 0); } }; -- To view, visit http://gerrit.ovirt.org/28849 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If3c63419c3cd715ec28e0b89cfd5ccd6b3c0af67 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
