paulmataruso/tacticalrmm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix other checks getting deleted when deleting a policy check

Browse Source
This commit is contained in:
sadnub
2021-05-04 20:01:44 -04:00
parent 589ff46ea5
commit 10bc133cf1
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -430,11 +430,12 @@ class Policy(BaseAuditModel):
# remove policy checks from agent that fell out of policy scope # remove policy checks from agent that fell out of policy scope
agent.agentchecks.filter( agent.agentchecks.filter(
managed_by_policy=True,
parent_check__in=[ parent_check__in=[
checkpk checkpk
for checkpk in agent_checks_parent_pks for checkpk in agent_checks_parent_pks
if checkpk not in [check.pk for check in final_list] if checkpk not in [check.pk for check in final_list]
] ],
).delete() ).delete()
return [ return [

3
api/tacticalrmm/checks/views.py
View File

@@ -123,11 +123,12 @@ class GetUpdateDeleteCheck(APIView):
from automation.tasks import generate_agent_checks_task from automation.tasks import generate_agent_checks_task
check = get_object_or_404(Check, pk=pk) check = get_object_or_404(Check, pk=pk)
check.delete() check.delete()
# Policy check deleted # Policy check deleted
if check.policy: if check.policy:
Check.objects.filter(parent_check=check.pk).delete() Check.objects.filter(managed_by_policy=True, parent_check=pk).delete()
# Re-evaluate agent checks is policy was enforced # Re-evaluate agent checks is policy was enforced
if check.policy.enforced: if check.policy.enforced: