Przeglądaj źródła

Fixes #4043: Fix toggling of required fields in custom scripts

Jeremy Stretch 6 lat temu
rodzic
commit
e0d538ad31
2 zmienionych plików z 13 dodań i 4 usunięć
  1. 8 0
      docs/release-notes/version-2.7.md
  2. 5 4
      netbox/extras/scripts.py

+ 8 - 0
docs/release-notes/version-2.7.md

@@ -1,3 +1,11 @@
+# v2.7.4 (FUTURE)
+
+## Bug Fixes
+
+* [#4043](https://github.com/netbox-community/netbox/issues/4043) - Fix toggling of required fields in custom scripts
+
+---
+
 # v2.7.3 (2020-01-28)
 
 ## Enhancements

+ 5 - 4
netbox/extras/scripts.py

@@ -53,14 +53,15 @@ class ScriptVariable:
         # Initialize field attributes
         if not hasattr(self, 'field_attrs'):
             self.field_attrs = {}
-        if description:
-            self.field_attrs['help_text'] = description
         if label:
             self.field_attrs['label'] = label
+        if description:
+            self.field_attrs['help_text'] = description
         if default:
             self.field_attrs['initial'] = default
-        if required:
-            self.field_attrs['required'] = True
+        self.field_attrs['required'] = required
+
+        # Initialize the list of optional validators if none have already been defined
         if 'validators' not in self.field_attrs:
             self.field_attrs['validators'] = []