TRMM/tacticalrmm-web
1
0
Fork 0
mirror of https://github.com/jpros/tacticalrmm-web.git synced 2026-01-20 03:50:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix alert checkboxes with alert template applied

Browse Source
This commit is contained in:
sadnub
2021-10-22 20:00:43 -04:00
parent 6e60baa66e
commit 44e9fdc57f
4 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/components/AgentTable.vue
View File

@@ -271,7 +271,7 @@
<q-td>
<q-checkbox
v-if="props.row.alert_template && props.row.alert_template.always_text !== null"
:value="props.row.alert_template.always_text"
v-model="props.row.alert_template.always_text"
disable
dense
>
@@ -281,14 +281,14 @@
<q-checkbox
v-else
dense
@update:model-value="overdueAlert('text', props.row.id, props.row.overdue_text_alert)"
@update:model-value="overdueAlert('text', props.row, props.row.overdue_text_alert)"
v-model="props.row.overdue_text_alert"
/>
</q-td>
<q-td>
<q-checkbox
v-if="props.row.alert_template && props.row.alert_template.always_email !== null"
:value="props.row.alert_template.always_email"
v-model="props.row.alert_template.always_email"
disable
dense
>
@@ -298,14 +298,14 @@
<q-checkbox
v-else
dense
@update:model-value="overdueAlert('email', props.row.id, props.row.overdue_email_alert)"
@update:model-value="overdueAlert('email', props.row, props.row.overdue_email_alert)"
v-model="props.row.overdue_email_alert"
/>
</q-td>
<q-td>
<q-checkbox
v-if="props.row.alert_template && props.row.alert_template.always_alert !== null"
:value="props.row.alert_template.always_alert"
v-model="props.row.alert_template.always_alert"
disable
dense
>
@@ -315,7 +315,7 @@
<q-checkbox
v-else
dense
@update:model-value="overdueAlert('dashboard', props.row.id, props.row.overdue_dashboard_alert)"
@update:model-value="overdueAlert('dashboard', props.row, props.row.overdue_dashboard_alert)"
v-model="props.row.overdue_dashboard_alert"
/>
</q-td>
@@ -661,7 +661,7 @@ export default {
agentRowSelected(agent_id) {
this.$store.commit("setActiveRow", agent_id);
},
overdueAlert(category, agent_id, alert_action) {
overdueAlert(category, agent, alert_action) {
let db_field = "";
if (category === "email") db_field = "overdue_email_alert";
else if (category === "text") db_field = "overdue_text_alert";
@@ -673,12 +673,12 @@ export default {
};
const alertColor = !alert_action ? "positive" : "warning";
this.$axios
.put(`/agents/${agent_id}/`, data)
.put(`/agents/${agent.agent_id}/`, data)
.then(r => {
this.$q.notify({
color: alertColor,
icon: "fas fa-check-circle",
message: `Overdue ${category} alerts ${action} on ${r.data}`,
message: `Overdue ${category} alerts ${action} on ${agent.hostname}`,
});
})
.catch(e => {});

12
src/components/agents/AutomatedTasksTab.vue
View File

@@ -116,8 +116,8 @@
<!-- text alert -->
<q-td>
<q-checkbox
v-if="props.row.alert_template && !!props.row.alert_template.always_text"
:value="props.row.alert_template.always_text"
v-if="props.row.alert_template && props.row.alert_template.always_text !== null"
v-model="props.row.alert_template.always_text"
disable
dense
>
@@ -135,8 +135,8 @@
<!-- email alert -->
<q-td>
<q-checkbox
v-if="props.row.alert_template && !!props.row.alert_template.always_email"
:value="props.row.alert_template.always_email"
v-if="props.row.alert_template && props.row.alert_template.always_email !== null"
v-model="props.row.alert_template.always_email"
disable
dense
>
@@ -154,8 +154,8 @@
<!-- dashboard alert -->
<q-td>
<q-checkbox
v-if="props.row.alert_template && !!props.row.alert_template.always_alert"
:value="props.row.alert_template.always_alert"
v-if="props.row.alert_template && props.row.alert_template.always_alert !== null"
v-model="props.row.alert_template.always_alert"
disable
dense
>

12
src/components/agents/ChecksTab.vue
View File

@@ -140,8 +140,8 @@
<!-- text alert -->
<q-td>
<q-checkbox
v-if="props.row.alert_template && !!props.row.alert_template.always_text"
:value="props.row.alert_template.always_text"
v-if="props.row.alert_template && props.row.alert_template.always_text != null"
v-model="props.row.alert_template.always_text"
disable
dense
>
@@ -159,8 +159,8 @@
<!-- email alert -->
<q-td>
<q-checkbox
v-if="props.row.alert_template && !!props.row.alert_template.always_email"
:value="props.row.alert_template.always_email"
v-if="props.row.alert_template && props.row.alert_template.always_email != null"
v-model="props.row.alert_template.always_email"
disable
dense
>
@@ -178,8 +178,8 @@
<!-- dashboard alert -->
<q-td>
<q-checkbox
v-if="props.row.alert_template && !!props.row.alert_template.always_alert"
:value="props.row.alert_template.always_alert"
v-if="props.row.alert_template && props.row.alert_template.always_alert !== null"
v-model="props.row.alert_template.always_alert"
disable
dense
>

1
src/views/Dashboard.vue
View File

@@ -661,6 +661,7 @@ export default {
this.$axios
.get(`/agents/?${param}`)
.then(r => {
console.log(r.data);
this.frame = r.data;
this.$store.commit("AGENT_TABLE_LOADING", false);
})