From 270bd533014b7a3b59f1252eae0207c19b9fddbf Mon Sep 17 00:00:00 2001 From: Julio-Oliveira-Encora Date: Wed, 29 May 2024 14:49:07 -0300 Subject: [PATCH] Addressed PR comments. --- netbox/extras/conditions.py | 8 ++++---- netbox/extras/tests/test_event_rules.py | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/netbox/extras/conditions.py b/netbox/extras/conditions.py index 22ab15417..15d198a19 100644 --- a/netbox/extras/conditions.py +++ b/netbox/extras/conditions.py @@ -135,12 +135,12 @@ class ConditionSet: def __init__(self, ruleset): if type(ruleset) is not dict: raise ValueError(_("Ruleset must be a dictionary, not {ruleset}.").format(ruleset=type(ruleset))) - + print(len(ruleset)) if len(ruleset) == 1: self.logic = (list(ruleset.keys())[0]).lower() if self.logic not in (AND, OR): - raise ValueError( - f"Invalid logic type: {self.logic} (must be '{AND}' or '{OR}'). Please check documentation.") + raise ValueError(_( + f"Invalid logic type: {self.logic} (must be 'AND' or 'OR'). Please check documentation.")) # Compile the set of Conditions self.conditions = [ @@ -152,7 +152,7 @@ class ConditionSet: self.logic = None self.conditions = [Condition(**ruleset)] except TypeError: - raise ValueError(f"Incorrect key(s) informed. Please check documentation.") + raise ValueError(_("Incorrect key(s) informed. Please check documentation.")) def eval(self, data): """ diff --git a/netbox/extras/tests/test_event_rules.py b/netbox/extras/tests/test_event_rules.py index d1544a8fd..8cea2078a 100644 --- a/netbox/extras/tests/test_event_rules.py +++ b/netbox/extras/tests/test_event_rules.py @@ -13,7 +13,6 @@ from dcim.choices import SiteStatusChoices from dcim.models import Site from extras.choices import EventRuleActionChoices, ObjectChangeActionChoices from extras.events import enqueue_object, flush_events, serialize_for_event -from extras.forms import SavedFilterForm, EventRuleForm from extras.models import EventRule, Tag, Webhook from extras.webhooks import generate_signature, send_webhook from utilities.testing import APITestCase