Gilad Chaplik has uploaded a new change for review. Change subject: webadmin: Added Qos per profile when removing qos ......................................................................
webadmin: Added Qos per profile when removing qos When removing multiple qos for datacenter which are connected to storage profiles a message appears which state which profiles are connected to those qos, but without stating which qos belong to each profile(This is a problem only when selecting multiple qos for removal). The following fix adds the associated qos to each profile name in the message. Change-Id: I474d38f934f8aaef482f06a81603bbd8566cb871 Bug-Url: https://bugzilla.redhat.com/1142854 Signed-off-by: Tomer Saban <tsa...@redhat.com> (cherry picked from commit a5798e2354c94daf7b5177281aee9dc9998501b3) --- M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/qos/RemoveQosModel.java 1 file changed, 13 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/33900/1 diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/qos/RemoveQosModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/qos/RemoveQosModel.java index 14fe24e..36ebaea 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/qos/RemoveQosModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/qos/RemoveQosModel.java @@ -1,7 +1,10 @@ package org.ovirt.engine.ui.uicommonweb.models.datacenters.qos; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.Map.Entry; import org.ovirt.engine.core.common.action.QosParametersBase; import org.ovirt.engine.core.common.action.VdcActionParametersBase; @@ -66,26 +69,30 @@ @Override public void executed(FrontendMultipleQueryAsyncResult result) { - List<ProfileBase> profiles = new ArrayList<ProfileBase>(); + Map<ProfileBase, String> profilesAndQos = new HashMap<ProfileBase, String>(); setHelpTag(getRemoveQosHelpTag()); setHashName(getRemoveQosHashName()); + int index = 0; for (VdcQueryReturnValue returnValue : result.getReturnValues()) { - profiles.addAll((List<ProfileBase>) returnValue.getReturnValue()); + for (ProfileBase profileBase : (List<ProfileBase>)returnValue.getReturnValue()) { + profilesAndQos.put(profileBase, sourceListModel.getSelectedItems().get(index).getName()); + } + index++; } - if (profiles.isEmpty()) { + if (profilesAndQos.isEmpty()) { ArrayList<String> list = new ArrayList<String>(); for (T item : sourceListModel.getSelectedItems()) { list.add(item.getName()); } setItems(list); } else { - setMessage(getRemoveQosMessage(profiles.size())); + setMessage(getRemoveQosMessage(profilesAndQos.size())); ArrayList<String> list = new ArrayList<String>(); - for (ProfileBase item : profiles) { - list.add(item.getName()); + for (Entry<ProfileBase, String> item : profilesAndQos.entrySet()) { + list.add(item.getKey().getName() + " (" + item.getValue() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ } setItems(list); } -- To view, visit http://gerrit.ovirt.org/33900 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I474d38f934f8aaef482f06a81603bbd8566cb871 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Gilad Chaplik <gchap...@redhat.com> Gerrit-Reviewer: Tomer Saban <tsa...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
