date formatting

pull/1/head
Valentin 2023-09-14 11:08:19 +02:00
parent e45c92d44b
commit 4d04f849dd
2 changed files with 4 additions and 4 deletions

View File

@ -18,7 +18,7 @@ router.get("/", (req, res) => {
var secret_display = null var secret_display = null
servers.forEach((server) => { servers.forEach((server) => {
if (server.lastPull != null) { if (server.lastPull != null) {
lastPullList[server.hostname] = server.lastPull.toISOString().replace(/T/, ' ').replace(/\..+/, '') lastPullList[server.hostname] = server.lastPull.toLocaleString()
} else { } else {
lastPullList[server.hostname] = 'never' lastPullList[server.hostname] = 'never'
} }

View File

@ -69,9 +69,9 @@ async function delServer(hostname) {
} }
async function getServerKeys(server) { async function getServerKeys(server) {
const dump = await sequelize.query('SELECT name,content FROM members JOIN users ON users.id = members.userId JOIN accesses ON members.groupName = members.groupName JOIN keys ON members.userId = keys.idOwner WHERE serverHostname = \'' + server + '\'', {}); const dump = await sequelize.query('SELECT name, content FROM servers JOIN accesses on accesses.serverHostname = servers.hostname JOIN members on members.groupName = accesses.groupName JOIN keys on keys.idOwner = members.userid WHERE serverHostname = \'' + server + '\'', {});
result = {} result = {}
console.log(dump)
for (x in dump) { for (x in dump) {
for (y in dump[x]) { for (y in dump[x]) {
try { try {
@ -95,7 +95,7 @@ async function getServerListForUserId(userId) {
result[(dump[0][x].hostname).toString()] = { result[(dump[0][x].hostname).toString()] = {
'username': dump[0][x].username, 'username': dump[0][x].username,
'ip': dump[0][x].ip, 'ip': dump[0][x].ip,
'lastPull': dump[0][x].lastPull 'lastPull': new Date(dump[0][x].lastPull).toLocaleString()
} }
} }
} }