7x31/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-08-09 10:41:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Maintenance standardize datetime format to YYYY-MM-DD hh:mm:ss

Browse Source 
- Import dayjs extensions one time only
- Maintenance activeCondition centralize
This commit is contained in:
Louis Lam
2022-09-28 00:20:17 +08:00
parent 4002b9f577
commit b1465c0282
14 changed files with 51 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/model/status_page.js
View File

@@ -2,6 +2,7 @@ const { BeanModel } = require("redbean-node/dist/bean-model");
const { R } = require("redbean-node");
const cheerio = require("cheerio");
const { UptimeKumaServer } = require("../uptime-kuma-server");
const Maintenance = require("./maintenance");
class StatusPage extends BeanModel {
@@ -271,14 +272,14 @@ class StatusPage extends BeanModel {
try {
const publicMaintenanceList = [];
let activeCondition = Maintenance.getActiveMaintenanceSQLCondition();
let maintenanceBeanList = R.convertToBeans("maintenance", await R.getAll(`
SELECT m.*
FROM maintenance m, maintenance_status_page msp, maintenance_timeslot
WHERE msp.maintenance_id = m.id
AND maintenance_timeslot.maintenance.id = m.id
AND maintenance_timeslot.start_date <= DATETIME('now')
AND maintenance_timeslot.end_date >= DATETIME('now')
AND msp.status_page_id = ?
AND maintenance_timeslot.maintenance.id = m.id
AND msp.status_page_id = ?
AND ${activeCondition}
ORDER BY m.end_date
`, [ statusPageId ]));