Skip to content

Commit 48db3d3

Browse files
committed
Release 0.19.1
2 parents 442f09d + 41ccd14 commit 48db3d3

File tree

3 files changed

+11
-4
lines changed

3 files changed

+11
-4
lines changed

api/tacticalrmm/agents/models.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,12 @@ def save(self, *args, **kwargs):
135135
orig = Agent.objects.get(pk=self.pk)
136136
mon_type_changed = self.monitoring_type != orig.monitoring_type
137137
site_changed = self.site_id != orig.site_id
138-
if mon_type_changed or site_changed:
138+
policy_changed = self.policy != orig.policy
139+
block_inherit = (
140+
self.block_policy_inheritance != orig.block_policy_inheritance
141+
)
142+
143+
if mon_type_changed or site_changed or policy_changed or block_inherit:
139144
self._processing_set_alert_template = True
140145
self.set_alert_template()
141146
self._processing_set_alert_template = False

api/tacticalrmm/alerts/models.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,8 @@ def handle_alert_resolve(
589589
core = CoreSettings.objects.first()
590590

591591
# set variables
592+
email_severities = None
593+
text_severities = None
592594
email_on_resolved = False
593595
text_on_resolved = False
594596
resolved_email_task = None
@@ -691,7 +693,7 @@ def handle_alert_resolve(
691693
and not core.notify_on_warning_alerts
692694
):
693695
pass
694-
elif alert.severity not in email_severities:
696+
elif email_severities and alert.severity not in email_severities:
695697
pass
696698
else:
697699
resolved_email_task.delay(pk=alert.pk)
@@ -706,7 +708,7 @@ def handle_alert_resolve(
706708
and not core.notify_on_warning_alerts
707709
):
708710
pass
709-
elif alert.severity not in text_severities:
711+
elif text_severities and alert.severity not in text_severities:
710712
pass
711713
else:
712714
resolved_text_task.delay(pk=alert.pk)

api/tacticalrmm/tacticalrmm/settings.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
AUTH_USER_MODEL = "accounts.User"
2222

2323
# latest release
24-
TRMM_VERSION = "0.19.0"
24+
TRMM_VERSION = "0.19.1"
2525

2626
# https://github.com/amidaware/tacticalrmm-web
2727
WEB_VERSION = "0.101.47"

0 commit comments

Comments
 (0)