7x31/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-08-21 06:46:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.23.X-merge-to-2.X.X

Browse Source 
# Conflicts:
#	server/model/monitor.js
#	server/util-server.js
This commit is contained in:
Louis Lam
2023-11-13 21:25:49 +08:00
parent 0f980e97b1 5b6522a54e
commit 188fdcb6ad
23 changed files with 9 additions and 573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pages/Entry.vue
View File

@@ -33,10 +33,10 @@ export default {
} else if (res.type === "entryPage") { // Dev only. For production, the logic is in the server side
const entryPage = res.entryPage;
if (entryPage === "statusPage") {
this.$router.push("/status");
if (entryPage?.startsWith("statusPage-")) {
this.$router.push("/status/" + entryPage.replace("statusPage-", ""));
} else {
// should the old setting style still exist here?
this.$router.push("/dashboard");
}
} else if (res.type === "setup-database") {