Rooba
/
tacticalrmm
mirror of https://github.com/amidaware/tacticalrmm.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug fixes with automated manager deleting policies and adding

This commit is contained in:
sadnub 2021-01-30 18:12:09 -05:00
parent ac058e9675
commit a5f123b9ce
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
api/tacticalrmm/automation/models.py
View File

@ -25,15 +25,12 @@ class Policy(BaseAuditModel):
super(Policy, self).save(*args, **kwargs)
# generate agent checks only if active and enforced were changed
if (
old_policy
and old_policy.active != self.active
or old_policy.enforced != self.enforced
):
generate_agent_checks_from_policies_task.delay(
policypk=self.pk,
create_tasks=True,
)
if old_policy:
if old_policy.active != self.active or old_policy.enforced != self.enforced:
generate_agent_checks_from_policies_task.delay(
policypk=self.pk,
create_tasks=True,
)
def delete(self, *args, **kwargs):
from automation.tasks import generate_agent_checks_task
@ -41,7 +38,7 @@ class Policy(BaseAuditModel):
agents = self.related_agents().values_list("pk", flat=True)
super(BaseAuditModel, self).delete(*args, **kwargs)
generate_agent_checks_task.delay(agents, create_tasks=True)
generate_agent_checks_task.delay(list(agents), create_tasks=True)
@property
def is_default_server_policy(self):

3
web/src/components/automation/AutomationManager.vue
View File

@ -103,7 +103,7 @@
<q-item-section>Copy</q-item-section>
</q-item>
<q-item clickable v-close-popup @click="deletePolicy(props.row.id)">
<q-item clickable v-close-popup @click="deletePolicy(props.row)">
<q-item-section side>
<q-icon name="delete" />
</q-item-section>
@ -326,6 +326,7 @@ export default {
this.refresh();
this.$q.loading.hide();
this.notifySuccess("Policy was deleted!");
this.$store.dispatch("loadTree");
})
.catch(error => {
this.$q.loading.hide();

2
web/src/components/modals/alerts/AlertTemplateAdd.vue
View File

@ -58,7 +58,7 @@ export default {
methods: {
submit() {
// close because nothing was edited
if (this.object.alertTemplate === this.selectedTemplate) {
if (this.object.alert_template === this.selectedTemplate) {
this.hide();
return;
}