ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-01-31 08:46:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

post-merge adaptations

Browse source
This commit is contained in:
Gero Gerke 2024-11-23 16:17:57 +01:00
parent e93418d920
commit f171e101fd
No known key found for this signature in database
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/model/status_page.js
View file

@ -259,7 +259,7 @@ class StatusPage extends BeanModel {
* Get all status page data in one call * Get all status page data in one call
* @param {StatusPage} statusPage * @param {StatusPage} statusPage
* @param {boolean} [includeStatus = false] whether each monitor should include the status of the monitor ("up" or "down") * @param {boolean} [includeStatus = false] whether each monitor should include the status of the monitor ("up" or "down")
* @param {boolean} [includeConfig = true] whether the config for the status paghe should be included in the returned JSON * @param {boolean} [includeConfig = true] whether the config for the status page should be included in the returned JSON
*/ */
static async getStatusPageData(statusPage, includeStatus = false, includeConfig = true) { static async getStatusPageData(statusPage, includeStatus = false, includeConfig = true) {
// Incident // Incident
@ -282,7 +282,7 @@ class StatusPage extends BeanModel {
]); ]);
for (let groupBean of list) { for (let groupBean of list) {
let monitorGroup = await groupBean.toPublicJSON(showTags, includeStatus); let monitorGroup = await groupBean.toPublicJSON(showTags, false, includeStatus);
publicGroupList.push(monitorGroup); publicGroupList.push(monitorGroup);
} }

2
server/routers/status-page-router.js
View file

@ -2,7 +2,7 @@ let express = require("express");
const apicache = require("../modules/apicache"); const apicache = require("../modules/apicache");
const { UptimeKumaServer } = require("../uptime-kuma-server"); const { UptimeKumaServer } = require("../uptime-kuma-server");
const StatusPage = require("../model/status_page"); const StatusPage = require("../model/status_page");
const { allowDevAllOrigin, sendHttpError } = require("../util-server"); const { allowAllOrigin, allowDevAllOrigin, sendHttpError } = require("../util-server");
const { R } = require("redbean-node"); const { R } = require("redbean-node");
const { badgeConstants } = require("../../src/util"); const { badgeConstants } = require("../../src/util");
const { makeBadge } = require("badge-maker"); const { makeBadge } = require("badge-maker");