mirror of
https://github.com/louislam/uptime-kuma.git
synced 2025-07-21 06:02:04 -04:00
Merge branch '1.14.X'
# Conflicts: # package.json # server/server.js
This commit is contained in:
commit
29d2d95c71
9 changed files with 112 additions and 83 deletions
|
@ -6,7 +6,7 @@ const ImageDataURI = require("../image-data-uri");
|
|||
const Database = require("../database");
|
||||
const apicache = require("../modules/apicache");
|
||||
const StatusPage = require("../model/status_page");
|
||||
const server = require("../server");
|
||||
const { UptimeKumaServer } = require("../uptime-kuma-server");
|
||||
|
||||
module.exports.statusPageSocketHandler = (socket) => {
|
||||
|
||||
|
@ -215,6 +215,8 @@ module.exports.statusPageSocketHandler = (socket) => {
|
|||
];
|
||||
await R.exec(`DELETE FROM \`group\` WHERE id NOT IN (${slots}) AND status_page_id = ?`, data);
|
||||
|
||||
const server = UptimeKumaServer.getInstance();
|
||||
|
||||
// Also change entry page to new slug if it is the default one, and slug is changed.
|
||||
if (server.entryPage === "statusPage-" + slug && statusPage.slug !== slug) {
|
||||
server.entryPage = "statusPage-" + statusPage.slug;
|
||||
|
@ -284,6 +286,8 @@ module.exports.statusPageSocketHandler = (socket) => {
|
|||
|
||||
// Delete a status page
|
||||
socket.on("deleteStatusPage", async (slug, callback) => {
|
||||
const server = UptimeKumaServer.getInstance();
|
||||
|
||||
try {
|
||||
checkLogin(socket);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue