Skip to content

Commit 21f84ae

Browse files
committed
reformat datetime
1 parent bc690c0 commit 21f84ae

File tree

2 files changed

+6
-8
lines changed
  • app/aem

2 files changed

+6
-8
lines changed

app/aem/core/src/main/java/com/cognifide/apm/core/scripts/ScriptModel.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import java.util.Arrays;
3535
import java.util.Calendar;
3636
import java.util.Date;
37-
import java.util.GregorianCalendar;
3837
import java.util.List;
3938
import java.util.Objects;
4039
import java.util.Optional;
@@ -239,17 +238,17 @@ private void setProperty(String name, Object value) throws PersistenceException
239238
ResourceResolver resolver = resource.getResourceResolver();
240239
boolean compositeNodeStore = RuntimeUtils.determineCompositeNodeStore(resolver);
241240
if (!compositeNodeStore || !PathUtils.isAppsOrLibsPath(path)) {
242-
ModifiableValueMap vm = resource.adaptTo(ModifiableValueMap.class);
243-
ResourceMixinUtil.addMixin(vm, ScriptNode.APM_SCRIPT);
244-
vm.put(name, convertValue(value));
241+
ModifiableValueMap valueMap = resource.adaptTo(ModifiableValueMap.class);
242+
ResourceMixinUtil.addMixin(valueMap, ScriptNode.APM_SCRIPT);
243+
valueMap.put(name, convertValue(value));
245244

246245
resolver.commit();
247246
}
248247
}
249248

250249
private Object convertValue(Object obj) {
251250
if (obj instanceof Date) {
252-
Calendar calendar = new GregorianCalendar();
251+
Calendar calendar = Calendar.getInstance();
253252
calendar.setTime((Date) obj);
254253

255254
return calendar;

app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/components/historyRow/historyRow.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@
2929
<a href="${item.scriptContentPath}" download="${item.scriptName}"
3030
style="text-decoration:none; color:#4b4b4b">${item.scriptName}</a>
3131
</td>
32-
<td is="coral-table-cell" value="${item.executionTime.time || 0}">
33-
<time datetime="${item.executionTime.time || 0}"
34-
data-sly-test="${item.executionTime}"
32+
<td is="coral-table-cell" value="${item.executionTime.timeInMillis || 0}">
33+
<time data-sly-test="${item.executionTime}" datetime="${item.executionTime.timeInMillis || 0}"
3534
data-sly-use.execLast="${'com.adobe.cq.xf.ui.DateFormatter' @ date=item.executionTimeCalendar, simpleFormat='yyyy-MM-dd HH:mm:ss'}">
3635
${execLast.date}
3736
</time>

0 commit comments

Comments
 (0)