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

Merge remote-tracking branch 'origin/master' into doubles-ss_master

Browse Source 
# Conflicts:
#	server/database.js
This commit is contained in:
Louis Lam
2023-03-12 18:38:19 +08:00
parent d668812df1 0efabb4e39
commit 491239415e
67 changed files with 4238 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/pages/EditMonitor.vue
View File

@@ -414,6 +414,12 @@
</div>
</template>
<!-- Description -->
<div class="my-3">
<label for="description" class="form-label">{{ $t("Description") }}</label>
<input id="description" v-model="monitor.description" type="text" class="form-control">
</div>
<div class="my-3">
<tags-manager ref="tagsManager" :pre-selected-tags="monitor.tags"></tags-manager>
</div>
@@ -949,7 +955,16 @@ message HealthCheckResponse {
this.monitor.includeSensitiveData = undefined;
this.monitor.maintenance = undefined;
this.monitor.name = this.$t("cloneOf", [ this.monitor.name ]);
this.monitor.tags = undefined; // FIXME: Cloning tags does not work yet
this.$refs.tagsManager.newTags = this.monitor.tags.map((monitorTag) => {
return {
id: monitorTag.tag_id,
name: monitorTag.name,
color: monitorTag.color,
value: monitorTag.value,
new: true,
};
});
this.monitor.tags = undefined;
}
// Handling for monitors that are created before 1.7.0