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

Merge branch 'master' into public-dashboard

Browse Source 
# Conflicts:
#	src/components/MonitorList.vue
#	src/icon.js
This commit is contained in:
LouisLam
2021-09-14 15:05:04 +08:00
parent f9311e4e7f 069c811af8
commit 9902c181bc
12 changed files with 873 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/model/monitor.js
View File

@@ -45,6 +45,8 @@ class Monitor extends BeanModel {
notificationIDList[bean.notification_id] = true;
}
const tags = await R.getAll("SELECT mt.*, tag.name, tag.color FROM monitor_tag mt JOIN tag ON mt.tag_id = tag.id WHERE mt.monitor_id = ?", [this.id]);
return {
id: this.id,
name: this.name,
@@ -65,6 +67,7 @@ class Monitor extends BeanModel {
dns_resolve_server: this.dns_resolve_server,
dns_last_result: this.dns_last_result,
notificationIDList,
tags: tags,
};
}