[Engine-patches] Change in ovirt-engine[master]: webadmin : Fix for rebalance status popup not coming up

[anbabu]

anmolbabu has uploaded a new change for review.

Change subject: webadmin : Fix for rebalance status popup not coming up
......................................................................

webadmin : Fix for rebalance status popup not coming up

Fix for rebalance status popup not coming up.
The issue was with date parser getting an empty string
not being handled appropriately.

Change-Id: I9087a10c7d71a7cfca3af23916062cdc92f4198f
Signed-off-by: Anmol Babu <anb...@redhat.com>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeRebalanceStatusModel.java
M 
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java
2 files changed, 6 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/54/27954/1

diff --git 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeRebalanceStatusModel.java
 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeRebalanceStatusModel.java
index 98afbb2..f24aceb 100644
--- 
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeRebalanceStatusModel.java
+++ 
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/gluster/VolumeRebalanceStatusModel.java
@@ -55,10 +55,8 @@
         setVolume(new EntityModel<String>());
         setCluster(new EntityModel<String>());
         setStartTime(new EntityModel<Date>());
-        getStartTime().setEntity(new Date());
         setStatusTime(new EntityModel<Date>());
         setStopTime(new EntityModel<Date>());
-        getStopTime().setEntity(new Date());
         setRebalanceSessions(new 
ListModel<EntityModel<GlusterVolumeTaskStatusForHost>>());
         setEntity(volumeEntity);
         refresh = new Timer() {
diff --git 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java
 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java
index 7f8d783..3b714c6 100644
--- 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java
+++ 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/gluster/VolumeRebalanceStatusPopupView.java
@@ -232,7 +232,12 @@
         }, new Parser<Date>() {
             @Override
             public Date parse(CharSequence text) throws ParseException {
-                return new Date(Date.parse(text.toString()));
+                if(text.toString().isEmpty() || text == null) {
+                    return null;
+                }
+                else {
+                    return new Date(Date.parse(text.toString()));
+                }
             }
         });
     }


-- 
To view, visit http://gerrit.ovirt.org/27954
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9087a10c7d71a7cfca3af23916062cdc92f4198f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: anmolbabu <anb...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches