modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitDataSource.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
New commits: commit b8e581f2c9cd8f39425d8a8ccffd253d635e8b12 Merge: e8884f7... eb59feb... Author: Heiko W. Rupp hwr@redhat.com Date: Wed Jan 5 21:00:43 2011 +0100
Merge branch 'master' of ssh://git.fedorahosted.org/git/rhq/rhq
commit e8884f75bc99cb7a8717c5cd044763d5d85eb3ec Author: Heiko W. Rupp hwr@redhat.com Date: Wed Jan 5 18:30:07 2011 +0100
Format last changed date of traits as datetime and not epoch millis.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitDataSource.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitDataSource.java index 7ed351a..102d598 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitDataSource.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitDataSource.java @@ -18,6 +18,7 @@ */ package org.rhq.enterprise.gui.coregui.client.inventory.common;
+import java.util.Date; import java.util.List; import java.util.Map;
@@ -27,6 +28,7 @@ import com.smartgwt.client.data.DSRequest; import com.smartgwt.client.data.DSResponse; import com.smartgwt.client.data.DataSourceField; import com.smartgwt.client.data.Record; +import com.smartgwt.client.data.fields.DataSourceDateTimeField; import com.smartgwt.client.data.fields.DataSourceIntegerField; import com.smartgwt.client.data.fields.DataSourceTextField; import com.smartgwt.client.rpc.RPCResponse; @@ -78,7 +80,7 @@ public abstract class AbstractMeasurementDataTraitDataSource extends RPCDataSour .common_title_value()); fields.add(valueField);
- DataSourceIntegerField timestampField = new DataSourceIntegerField( + DataSourceDateTimeField timestampField = new DataSourceDateTimeField( MeasurementDataTraitCriteria.SORT_FIELD_TIMESTAMP, MSG.dataSource_traits_field_lastChanged()); fields.add(timestampField);
@@ -147,7 +149,7 @@ public abstract class AbstractMeasurementDataTraitDataSource extends RPCDataSour
record.setAttribute("primaryKey", from.getScheduleId() + ":" + from.getTimestamp()); record.setAttribute("id", from.getSchedule().getDefinition().getId()); // used for detail view - record.setAttribute(MeasurementDataTraitCriteria.SORT_FIELD_TIMESTAMP, from.getTimestamp()); + record.setAttribute(MeasurementDataTraitCriteria.SORT_FIELD_TIMESTAMP, new Date(from.getTimestamp())); record.setAttribute(MeasurementDataTraitCriteria.SORT_FIELD_DISPLAY_NAME, from.getSchedule().getDefinition() .getDisplayName()); record.setAttribute(MeasurementDataTraitCriteria.SORT_FIELD_VALUE, from.getValue());
rhq-commits@lists.fedorahosted.org