ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-11-23 14:54:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(tags): Fix the tag deletion (#5298)
Some checks failed
Auto Test / armv7-simple-test (18, ARMv7) (push) Has been cancelled
Details
Auto Test / armv7-simple-test (20, ARMv7) (push) Has been cancelled
Details
Auto Test / check-linters (push) Has been cancelled
Details
Auto Test / e2e-test (push) Has been cancelled
Details
CodeQL / Analyze (push) Has been cancelled
Details
Merge Conflict Labeler / Labeling (push) Has been cancelled
Details
validate / json-yaml-validate (push) Has been cancelled
Details
validate / validate (push) Has been cancelled
Details
Auto Test / auto-test (18, ARM64) (push) Has been cancelled
Details
Auto Test / auto-test (18, macos-latest) (push) Has been cancelled
Details
Auto Test / auto-test (18, ubuntu-latest) (push) Has been cancelled
Details
Auto Test / auto-test (18, windows-latest) (push) Has been cancelled
Details
Auto Test / auto-test (20, ARM64) (push) Has been cancelled
Details
Auto Test / auto-test (20, macos-latest) (push) Has been cancelled
Details
Auto Test / auto-test (20, ubuntu-latest) (push) Has been cancelled
Details
Auto Test / auto-test (20, windows-latest) (push) Has been cancelled
Details

Browse source
This commit is contained in:
Ionys 2024-11-02 13:09:23 +01:00 committed by GitHub
parent 0254e72177
commit 595b35fb15
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/model/monitor.js
View file

@ -1522,7 +1522,7 @@ class Monitor extends BeanModel {
*/ */
static async getMonitorTag(monitorIDs) { static async getMonitorTag(monitorIDs) {
return await R.getAll(` return await R.getAll(`
SELECT monitor_tag.monitor_id, monitor_tag.tag_id, tag.name, tag.color SELECT monitor_tag.monitor_id, monitor_tag.tag_id, monitor_tag.value, tag.name, tag.color
FROM monitor_tag FROM monitor_tag
JOIN tag ON monitor_tag.tag_id = tag.id JOIN tag ON monitor_tag.tag_id = tag.id
WHERE monitor_tag.monitor_id IN (${monitorIDs.map((_) => "?").join(",")}) WHERE monitor_tag.monitor_id IN (${monitorIDs.map((_) => "?").join(",")})
@ -1567,6 +1567,8 @@ class Monitor extends BeanModel {
} }
tagsMap.get(row.monitor_id).push({ tagsMap.get(row.monitor_id).push({
tag_id: row.tag_id, tag_id: row.tag_id,
monitor_id: row.monitor_id,
value: row.value,
name: row.name, name: row.name,
color: row.color color: row.color
}); });