Hello Shmuel Melamud,
I'd like you to do a code review. Please visit
https://gerrit.ovirt.org/41853
to review the following change.
Change subject: webadmin: Correctly restore cluster architecture selection
......................................................................
webadmin: Correctly restore cluster architecture selection
In ClusterModel, when list of CPU architectures is populated, save the
current selection before that and restore it afterwards.
Also, implemented correct behaviour when current selection is null and
current entity is also null, which caused exception.
Change-Id: I0a838f35cf037783f14fc96f5b66f0aa3674d89b
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1223742
Signed-off-by: Shmuel Melamud <[email protected]>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java
1 file changed, 8 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/53/41853/1
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java
index bec71e4..30f0934 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java
@@ -1846,6 +1846,7 @@
getArchitecture().getSelectedItemChangedEvent().removeListener(this);
ServerCpu oldSelectedCpu = clusterModel.getCPU().getSelectedItem();
+ ArchitectureType oldSelectedArch =
clusterModel.getArchitecture().getSelectedItem();
clusterModel.getCPU().setItems(cpus);
initSupportedArchitectures(clusterModel);
@@ -1860,17 +1861,18 @@
if (clusterModel.getIsEdit()) {
if (!canChangeArchitecture) {
- getArchitecture().setItems(new
ArrayList<ArchitectureType>(Arrays.asList(clusterModel.getEntity()
- .getArchitecture())));
+ getArchitecture().setItems(new ArrayList<ArchitectureType>(
+
Arrays.asList(clusterModel.getEntity().getArchitecture())));
}
-
- ArchitectureType oldSelectedArch =
- clusterModel.getArchitecture().getSelectedItem();
if (oldSelectedArch != null) {
getArchitecture().setSelectedItem(oldSelectedArch);
} else {
-
getArchitecture().setSelectedItem(getEntity().getArchitecture());
+ if (clusterModel.getEntity() != null) {
+
getArchitecture().setSelectedItem(clusterModel.getEntity().getArchitecture());
+ } else {
+
getArchitecture().setSelectedItem(ArchitectureType.undefined);
+ }
}
} else {
getArchitecture().setSelectedItem(ArchitectureType.undefined);
--
To view, visit https://gerrit.ovirt.org/41853
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a838f35cf037783f14fc96f5b66f0aa3674d89b
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Shmuel Leib Melamud <[email protected]>
Gerrit-Reviewer: Shmuel Melamud <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
