From 36aad45b26ff65b31b0010d9aac64b5b5e1eea9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 5 Jan 2018 17:23:40 +0100 Subject: [PATCH] Asset search JS: show creation timestamps --- src/scripts/elasticsearch.js | 22 ++++++++-------------- src/templates/nodes/search.pug | 2 +- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/scripts/elasticsearch.js b/src/scripts/elasticsearch.js index 4d638a0c..457006a2 100644 --- a/src/scripts/elasticsearch.js +++ b/src/scripts/elasticsearch.js @@ -85,16 +85,9 @@ $(document).ready(function() { // Initial search initWithUrlParams(); - function convertTimestamp(timestamp) { - var d = new Date(timestamp * 1000), // Convert the passed timestamp to milliseconds - yyyy = d.getFullYear(), - mm = ('0' + (d.getMonth() + 1)).slice(-2), // Months are zero based. Add leading 0. - dd = ('0' + d.getDate()).slice(-2), // Add leading 0. - time; - - time = dd + '/' + mm + '/' + yyyy; - - return time; + function convertTimestamp(iso8601) { + var d = new Date(iso8601) + return d.toLocaleDateString(); } @@ -110,13 +103,14 @@ $(document).ready(function() { function renderHits(content) { var hitsHtml = ''; for (var i = 0; i < content.hits.length; ++i) { - var created = content.hits[i].created; + console.log('rendering hit ', i, ': ', content.hits[i]); + var created = content.hits[i].created_at; if (created) { - content.hits[i].created = convertTimestamp(created); + content.hits[i].created_at = convertTimestamp(created); } - var updated = content.hits[i].updated; + var updated = content.hits[i].updated_at; if (updated) { - content.hits[i].updated = convertTimestamp(updated); + content.hits[i].updated_at = convertTimestamp(updated); } hitsHtml += hitTemplate.render(content.hits[i]); } diff --git a/src/templates/nodes/search.pug b/src/templates/nodes/search.pug index a3eb9e73..4cb112d9 100644 --- a/src/templates/nodes/search.pug +++ b/src/templates/nodes/search.pug @@ -147,7 +147,7 @@ script(type="text/template", id="hit-template") | {{#media}} span.media ยท {{{ media }}} | {{/media}} - span.when {{{ created }}} + span.when {{{ created_at }}} span.context a(href="/nodes/{{ objectID }}/redir") view in context