NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-19 14:08:17 -06:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Misc cleanup

Browse Source
This commit is contained in:
Jeremy Stretch 2023-11-27 10:37:47 -05:00
parent bf11f1db0d
commit f860345914
5 changed files with 89 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
netbox/extras/migrations/0101_eventrule.py
View File

@ -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.contrib.contenttypes.models import ContentType
from django.db import migrations, models from django.db import migrations, models
import django.db.models.deletion
from extras.choices import *
import extras.utils
import taggit.managers
import utilities.json import utilities.json
from extras.choices import *
def move_webhooks(apps, schema_editor): def move_webhooks(apps, schema_editor):

5
netbox/extras/models/models.py
View File

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

2
netbox/extras/scripts_worker.py
View File

@ -20,7 +20,7 @@ def process_script(event_rule, data, username, **kwargs):
return return
script_choice = None 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'] script_choice = event_rule.action_parameters['script_choice']
if script_choice: if script_choice:

8
netbox/extras/utils.py
View File

@ -1,15 +1,7 @@
import logging
from django.db.models import Q
from django.utils.deconstruct import deconstructible
from taggit.managers import _TaggableManager 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 from netbox.registry import registry
logger = logging.getLogger('netbox.extras.utils')
def is_taggable(obj): def is_taggable(obj):
""" """

8
netbox/templates/extras/eventrule.html
View File

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