TRMM/tacticalrmm-web
1
0
Fork 0
mirror of https://github.com/jpros/tacticalrmm-web.git synced 2026-02-17 01:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix some prop errors in addautomatedtask and fix display of assigned checks and tasks in policy check/task tabs

Browse Source
This commit is contained in:
sadnub
2021-10-22 17:21:16 -04:00
parent e87a42ebb6
commit dfbd641df8
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -271,7 +271,7 @@
}}</span>
</q-td>
<q-td>{{ props.row.last_run || "Never" }}</q-td>
<q-td v-if="props.row.assigned_task !== null && props.row.assigned_task.length > 1"
<q-td v-if="!!props.row.assigned_task && props.row.assigned_task.length > 1"
>{{ props.row.assigned_task.length }} Tasks</q-td
>
<q-td v-else-if="props.row.assigned_task">{{ props.row.assigned_task.name }}</q-td>

7
src/components/automation/PolicyAutomatedTasksTab.vue
View File

@@ -154,8 +154,7 @@
>See Status</span
>
</q-td>
<q-td v-if="props.row.assigned_check">{{ props.row.assigned_check.readable_desc }}</q-td>
<q-td v-else></q-td>
<q-td>{{ props.row.check_name }}</q-td>
</q-tr>
</template>
</q-table>
@@ -200,9 +199,9 @@ export default {
sortable: true,
},
{
name: "assignedcheck",
name: "check_name",
label: "Assigned Check",
field: "assigned_check",
field: "check_name",
align: "left",
sortable: true,
},

8
src/components/automation/PolicyChecksTab.vue
View File

@@ -161,10 +161,10 @@
>See Status</span
>
</q-td>
<q-td v-if="!!props.row.assignedtask && props.row.assignedtask.length === 1">{{
props.row.assignedtask[0].name
}}</q-td>
<q-td v-else-if="!!props.row.assignedtask">{{ props.row.assignedtask.length }} Tasks</q-td>
<q-td v-if="!!props.row.assigned_task && props.row.assigned_task.length > 1"
>{{ props.row.assigned_task.length }} Tasks</q-td
>
<q-td v-else-if="!!props.row.assigned_task">{{ props.row.assigned_task.name }}</q-td>
<q-td v-else></q-td>
</q-tr>
</template>

3
src/components/tasks/AddAutomatedTask.vue
View File

@@ -252,6 +252,7 @@ export default {
const loading = ref(false);
async function submit() {
console.log(task.value);
if (!step1Done.value || !step2Done.value) {
notifyError("Some steps are incomplete");
return;
@@ -289,7 +290,7 @@ export default {
const step1Done = computed(() => {
return (
(!!script.value && !!task.value.name && !!defaultTimeout.value && !collector.value) ||
(!!script.value && !!task.value.name && !!defaultTimeout.value && collector.value && task.value.custom_field)
(!!script.value && !!task.value.name && !!defaultTimeout.value && collector.value && !!task.value.custom_field)
);
});