From 0b4fff907aeaca02f1e49c85f7c627dd9e6f1659 Mon Sep 17 00:00:00 2001
From: wh1te909 <7434746+wh1te909@users.noreply.github.com>
Date: Sat, 13 Jul 2024 00:28:27 +0000
Subject: [PATCH 1/4] back to dev [skip ci]

---
 api/tacticalrmm/tacticalrmm/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/tacticalrmm/tacticalrmm/settings.py b/api/tacticalrmm/tacticalrmm/settings.py
index c9f67c581c..66bb886a68 100644
--- a/api/tacticalrmm/tacticalrmm/settings.py
+++ b/api/tacticalrmm/tacticalrmm/settings.py
@@ -21,7 +21,7 @@
 AUTH_USER_MODEL = "accounts.User"
 
 # latest release
-TRMM_VERSION = "0.19.0"
+TRMM_VERSION = "0.19.1-dev"
 
 # https://github.com/amidaware/tacticalrmm-web
 WEB_VERSION = "0.101.47"

From 9c36f2cbc56237fe5564a2e9a7f2df124b703d75 Mon Sep 17 00:00:00 2001
From: wh1te909 <7434746+wh1te909@users.noreply.github.com>
Date: Wed, 17 Jul 2024 21:19:28 +0000
Subject: [PATCH 2/4] trigger policy refresh on more fields

---
 api/tacticalrmm/agents/models.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/api/tacticalrmm/agents/models.py b/api/tacticalrmm/agents/models.py
index 3933c3fe47..ee2973cbed 100644
--- a/api/tacticalrmm/agents/models.py
+++ b/api/tacticalrmm/agents/models.py
@@ -135,7 +135,12 @@ def save(self, *args, **kwargs):
             orig = Agent.objects.get(pk=self.pk)
             mon_type_changed = self.monitoring_type != orig.monitoring_type
             site_changed = self.site_id != orig.site_id
-            if mon_type_changed or site_changed:
+            policy_changed = self.policy != orig.policy
+            block_inherit = (
+                self.block_policy_inheritance != orig.block_policy_inheritance
+            )
+
+            if mon_type_changed or site_changed or policy_changed or block_inherit:
                 self._processing_set_alert_template = True
                 self.set_alert_template()
                 self._processing_set_alert_template = False

From 60800df7989eaa1e2d503649949591ac189433ae Mon Sep 17 00:00:00 2001
From: wh1te909 <7434746+wh1te909@users.noreply.github.com>
Date: Thu, 18 Jul 2024 00:52:34 +0000
Subject: [PATCH 3/4] fix resolved emails not being sent

---
 api/tacticalrmm/alerts/models.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/api/tacticalrmm/alerts/models.py b/api/tacticalrmm/alerts/models.py
index 8067096a80..c28b6d7599 100644
--- a/api/tacticalrmm/alerts/models.py
+++ b/api/tacticalrmm/alerts/models.py
@@ -589,6 +589,8 @@ def handle_alert_resolve(
         core = CoreSettings.objects.first()
 
         # set variables
+        email_severities = None
+        text_severities = None
         email_on_resolved = False
         text_on_resolved = False
         resolved_email_task = None
@@ -691,7 +693,7 @@ def handle_alert_resolve(
                 and not core.notify_on_warning_alerts
             ):
                 pass
-            elif alert.severity not in email_severities:
+            elif email_severities and alert.severity not in email_severities:
                 pass
             else:
                 resolved_email_task.delay(pk=alert.pk)
@@ -706,7 +708,7 @@ def handle_alert_resolve(
                 and not core.notify_on_warning_alerts
             ):
                 pass
-            elif alert.severity not in text_severities:
+            elif text_severities and alert.severity not in text_severities:
                 pass
             else:
                 resolved_text_task.delay(pk=alert.pk)

From 41ccd14f251010e3985150ff05291ffbdf2f0d6a Mon Sep 17 00:00:00 2001
From: wh1te909 <7434746+wh1te909@users.noreply.github.com>
Date: Thu, 18 Jul 2024 05:59:09 +0000
Subject: [PATCH 4/4] bump version [skip ci]

---
 api/tacticalrmm/tacticalrmm/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/tacticalrmm/tacticalrmm/settings.py b/api/tacticalrmm/tacticalrmm/settings.py
index 66bb886a68..f0a7cd890d 100644
--- a/api/tacticalrmm/tacticalrmm/settings.py
+++ b/api/tacticalrmm/tacticalrmm/settings.py
@@ -21,7 +21,7 @@
 AUTH_USER_MODEL = "accounts.User"
 
 # latest release
-TRMM_VERSION = "0.19.1-dev"
+TRMM_VERSION = "0.19.1"
 
 # https://github.com/amidaware/tacticalrmm-web
 WEB_VERSION = "0.101.47"