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

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

Browse Source 
# Conflicts:
#	docker/debian-base.dockerfile
This commit is contained in:
Louis Lam
2023-12-01 15:50:35 +08:00
parent 60be875edd e3396251a8
commit 81c9900e23
13 changed files with 77 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pages/EditMonitor.vue
View File

@@ -291,7 +291,9 @@
<div class="mb-3">
<label for="docker-host" class="form-label">{{ $t("Docker Host") }}</label>
<ActionSelect
id="docker-host"
v-model="monitor.docker_host"
:action-aria-label="$t('openModalTo', $t('Setup Docker Host'))"
:options="dockerHostOptionsList"
:disabled="$root.dockerHostList == null || $root.dockerHostList.length === 0"
:icon="'plus'"
@@ -501,9 +503,11 @@
<!-- Parent Monitor -->
<div class="my-3">
<label for="parent" class="form-label">{{ $t("Monitor Group") }}</label>
<label for="monitorGroupSelector" class="form-label">{{ $t("Monitor Group") }}</label>
<ActionSelect
id="monitorGroupSelector"
v-model="monitor.parent"
:action-aria-label="$t('openModalTo', 'setup a new monitor group')"
:options="parentMonitorOptionsList"
:disabled="sortedGroupMonitorList.length === 0 && draftGroupName == null"
:icon="'plus'"
@@ -866,7 +870,7 @@ const monitorDefaults = {
interval: 60,
retryInterval: 60,
resendInterval: 0,
maxretries: 1,
maxretries: 0,
timeout: 48,
notificationIDList: {},
ignoreTls: false,