Maor Lipchuk has uploaded a new change for review. Change subject: webadmin: Order VMs/Templates in alphabetical order on export domain ......................................................................
webadmin: Order VMs/Templates in alphabetical order on export domain Order the entities in the Export Storage Domain in an alphabetical order Change-Id: I81ba2555cc59823a22886c7fcc6a6fffdc3c8de0 Bug-Url: https://bugzilla.redhat.com/1088294` Signed-off-by: Maor Lipchuk <mlipc...@redhat.com> --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java 2 files changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/85/33285/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java index 87b085c..08f6652 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/TemplateBackupModel.java @@ -27,6 +27,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.UICommand; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.help.HelpTag; @@ -321,7 +322,6 @@ new ArrayList<Map.Entry<VmTemplate, List<DiskImage>>>(); HashMap<VmTemplate, List<DiskImage>> dictionary = (HashMap<VmTemplate, List<DiskImage>>) ((VdcQueryReturnValue) ReturnValue1).getReturnValue(); - ArrayList<VmTemplate> list = new ArrayList<VmTemplate>(); for (Map.Entry<VmTemplate, List<DiskImage>> item : dictionary.entrySet()) { @@ -331,6 +331,7 @@ template.getDiskList().addAll(item.getValue()); list.add(template); } + Collections.sort(list, new Linq.VmTemplateComparator()); backupModel1.setItems(list); TemplateBackupModel.this.extendedItems = items; } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java index 3efbfd3..7dba903 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/VmBackupModel.java @@ -32,6 +32,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.UICommand; import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import org.ovirt.engine.ui.uicommonweb.help.HelpTag; @@ -567,8 +568,9 @@ public void onSuccess(Object model1, Object ReturnValue1) { VmBackupModel backupModel1 = (VmBackupModel) model1; - - backupModel1.setItems((ArrayList<VM>) ((VdcQueryReturnValue) ReturnValue1).getReturnValue()); + ArrayList<VM> vms = ((VdcQueryReturnValue) ReturnValue1).getReturnValue(); + Collections.sort(vms, new Linq.VmComparator()); + backupModel1.setItems(vms); } }; GetAllFromExportDomainQueryParameters tempVar = new GetAllFromExportDomainQueryParameters( -- To view, visit http://gerrit.ovirt.org/33285 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I81ba2555cc59823a22886c7fcc6a6fffdc3c8de0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
