Tomas Jelinek has uploaded a new change for review.
Change subject: webadmin: NPE on new/edit pool
......................................................................
webadmin: NPE on new/edit pool
If no DC was up, the new/edit dialog pool failed on NPE.
Similar issue was also on the new/edit VM - fixed the same way.
Change-Id: Ia94ec0d89f3304597cce5187a1f449dc5fbfd6ed
Signed-off-by: Tomas Jelinek <tjeli...@redhat.com>
---
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java
2 files changed, 21 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/41/21541/1
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java
index b4a7cc7..73b4730 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/pools/PoolListModel.java
@@ -310,6 +310,21 @@
model.setCustomPropertiesKeysList(getCustomPropertiesKeysList());
model.startProgress("");
setWindow(model);
+
+ VmBasedWidgetSwitchModeCommand switchModeCommand = new
VmBasedWidgetSwitchModeCommand();
+ switchModeCommand.init(model);
+ model.getCommands().add(switchModeCommand);
+
+ UICommand command = new UICommand("OnSave",
poolListModel); //$NON-NLS-1$
+
command.setTitle(ConstantsManager.getInstance().getConstants().ok());
+ command.setIsDefault(true);
+ model.getCommands().add(command);
+
+ command = new UICommand("Cancel", poolListModel);
//$NON-NLS-1$
+
command.setTitle(ConstantsManager.getInstance().getConstants().cancel());
+ command.setIsCancel(true);
+ model.getCommands().add(command);
+
model.setTitle(ConstantsManager.getInstance().getConstants().editPoolTitle());
model.initialize(getSystemTreeSelectedItem());
model.getName().setEntity(pool.getName());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java
index a7c49c1..fd27874 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/PoolModelBehaviorBase.java
@@ -60,7 +60,12 @@
}
}
- postDataCentersLoaded(dataCenters);
+ if (!dataCenters.isEmpty()) {
+ postDataCentersLoaded(dataCenters);
+ } else {
+ getModel().disableEditing();
+ }
+
}
}, getModel().getHash()), true, false);
--
To view, visit http://gerrit.ovirt.org/21541
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia94ec0d89f3304597cce5187a1f449dc5fbfd6ed
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Tomas Jelinek <tjeli...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
