Misc cleanup

netbox/extras/migrations/0101_eventrule.py

@@ -1,12 +1,10 @@
-# Generated by Django 4.2.5 on 2023-10-31 14:37
-
+import django.db.models.deletion
+import taggit.managers
 from django.contrib.contenttypes.models import ContentType
 from django.db import migrations, models
-import django.db.models.deletion
-from extras.choices import *
-import extras.utils
-import taggit.managers
+
 import utilities.json
+from extras.choices import *
 
 
 def move_webhooks(apps, schema_editor):

netbox/extras/models/models.py

@@ -170,10 +170,7 @@ class EventRule(CustomFieldsMixin, ExportTemplatesMixin, TagsMixin, ChangeLogged
         if not self.conditions:
             return True
 
-        if ConditionSet(self.conditions).eval(data):
-            return True
-
-        return False
+        return ConditionSet(self.conditions).eval(data)
 
 
 class Webhook(CustomFieldsMixin, ExportTemplatesMixin, TagsMixin, ChangeLoggedModel):

netbox/extras/scripts_worker.py

@@ -20,7 +20,7 @@ def process_script(event_rule, data, username, **kwargs):
         return
 
     script_choice = None
-    if event_rule.action_parameters and 'script_choice' in event_rule_action_parameters:
+    if event_rule.action_parameters and 'script_choice' in event_rule.action_parameters:
         script_choice = event_rule.action_parameters['script_choice']
 
     if script_choice:

netbox/extras/utils.py

@@ -1,15 +1,7 @@
-import logging
-from django.db.models import Q
-from django.utils.deconstruct import deconstructible
 from taggit.managers import _TaggableManager
 
-from extras.conditions import ConditionSet
-from extras.choices import EventRuleActionChoices
-from netbox.config import get_config
 from netbox.registry import registry
 
-logger = logging.getLogger('netbox.extras.utils')
-
 
 def is_taggable(obj):
     """

netbox/templates/extras/eventrule.html

@@ -8,7 +8,7 @@
     <div class="col col-md-6">
       <div class="card">
         <h5 class="card-header">
-        {% trans "Webhook" %}
+          {% trans "Event Rule" %}
         </h5>
         <div class="card-body">
           <table class="table table-hover attr-table">
@@ -20,6 +20,10 @@
               <th scope="row">{% trans "Enabled" %}</th>
               <td>{% checkmark object.enabled %}</td>
             </tr>
+            <tr>
+              <th scope="row">{% trans "Description" %}</th>
+              <td>{{ object.description|placeholder }}</td>
+            </tr>
           </table>
         </div>
       </div>
@@ -57,7 +61,7 @@
     <div class="col col-md-6">
       <div class="card">
         <h5 class="card-header">
-        {% trans "Assigned Models" %}
+          {% trans "Object Types" %}
         </h5>
         <div class="card-body">
           <table class="table table-hover attr-table">