django-restit 4.2.164__tar.gz → 4.2.165__tar.gz

{django_restit-4.2.164 → django_restit-4.2.165}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-restit
-Version: 4.2.164
+Version: 4.2.165
 Summary: A Rest Framework for DJANGO
 License: MIT
 Author: Ian Starnes

{django_restit-4.2.164 → django_restit-4.2.165}/account/models/device.py

@@ -6,6 +6,8 @@ from rest import settings
 from objict import objict
 from datetime import datetime
 
+from rest import helpers as rh
+
 CM_BACKENDS = objict()
 DEVICE_USE_BUID = settings.get("DEVICE_USE_BUID", False)
 
@@ -85,8 +87,9 @@ class MemberDevice(models.Model, rm.RestModel, rm.MetaDataModel):
                 md.state = 1
             md.touch(request.ip)
             metadata = request.DATA.get("device_metadata", None)
-            if isinstance(metadata, dict):
-                md.set_metadata(metadata)
+            rh.debug("md.metadata", metadata)
+            if metadata is not None:
+                md.setProperty("device", metadata)
             return md
         md = MemberDevice(
             uuid=device_id, buid=buid,
@@ -100,8 +103,8 @@ class MemberDevice(models.Model, rm.RestModel, rm.MetaDataModel):
         md.save()
         md.setProperty("user_agent", request.META.get('HTTP_USER_AGENT', ''))
         metadata = request.DATA.get("device_metadata", None)
-        if isinstance(metadata, dict):
-            md.set_metadata(metadata)
+        if metadata is not None:
+            md.setProperty("device", metadata)
         return md
 
     @classmethod

django_restit-4.2.165/incident/migrations/0016_rule_notify_template.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.11 on 2025-01-03 19:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('incident', '0015_rule_title_template_alter_incident_state'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='rule',
+            name='notify_template',
+            field=models.TextField(default=None, null=True),
+        ),
+    ]

{django_restit-4.2.164 → django_restit-4.2.165}/incident/models/incident.py

@@ -280,9 +280,7 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
         try:
             action, perm = self.rule.action.split(":")
             members = Member.GetWithNotification(perm)
-            # count = self.getProperty("event_count", default=1, field_type=int)
-            url = F"{settings.INCIDENT_PORTAL_URL}?incident={self.pk}"
-            msg = f"Incident #{self.pk}\n{self.description}\n{url}"
+            msg = self.renderTemplate()
             for m in members:
                 m.sendSMS(msg)
         except Exception:
@@ -363,6 +361,29 @@ class Incident(models.Model, rm.RestModel, rm.MetaDataModel):
             context=dict(incident=self, portal_url=settings.INCIDENT_PORTAL_URL),
             email_only=True, from_email=INCIDENT_EMAIL_FROM)
 
+    def renderTemplate(self):
+        has_template = self.rule and self.rule.notify_template and not self.rule.notify_template.startswith("http")
+        url = self.renderURL()
+        if not has_template:
+            return f"Incident #{self.pk}\n{self.description}\n{url}"
+        template = self.rule.notify_template
+        try:
+            template = template.format(event=self)
+        except Exception:
+            pass
+        return template
+
+    def renderURL(self):
+        has_template = self.rule and self.rule.notify_template and self.rule.notify_template.startswith("http")
+        if not has_template:
+            return F"{settings.INCIDENT_PORTAL_URL}?incident={self.pk}"
+        url = self.rule.notify_template
+        try:
+            url = url.format(event=self)
+        except Exception:
+            pass
+        return url
+
     def lastSentAge(self):
         # prevent spams, only allow emails every 5 minutes
         if self.action_sent is None:

{django_restit-4.2.164 → django_restit-4.2.165}/incident/models/rules.py

@@ -65,6 +65,7 @@ class Rule(models.Model, rm.RestModel):
 
     name = models.CharField(max_length=200)
     title_template = models.CharField(max_length=200, default=None, null=True)
+    notify_template = models.TextField(default=None, null=True)
     # the group the rule gets assigned to when triggered
     group = models.ForeignKey("account.Group", on_delete=models.CASCADE, null=True, default=None)
     # category allows us to limit running rules to only those with a category

{django_restit-4.2.164 → django_restit-4.2.165}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-restit"
-version = "4.2.164"
+version = "4.2.165"
 description = "A Rest Framework for DJANGO"
 authors = ["Ian Starnes <ians@311labs.com>"]
 license = "MIT"

{django_restit-4.2.164 → django_restit-4.2.165}/rest/__init__.py

@@ -1,4 +1,4 @@
 from .uberdict import UberDict  # noqa: F401
 from .settings_helper import settings  # noqa: F401
 
-__version__ = "4.2.164"
+__version__ = "4.2.165"