mirror of
https://github.com/netbox-community/netbox.git
synced 2025-12-12 03:19:36 -06:00
Address PR feedback: Rename FilterModifierWidget parameter to widget
This commit is contained in:
parent
562334eac8
commit
5664684530
@ -189,7 +189,7 @@ class FilterModifierMixin:
|
|||||||
|
|
||||||
if len(lookups) > 1:
|
if len(lookups) > 1:
|
||||||
field.widget = FilterModifierWidget(
|
field.widget = FilterModifierWidget(
|
||||||
original_widget=field.widget,
|
widget=field.widget,
|
||||||
lookups=lookups
|
lookups=lookups
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -18,16 +18,16 @@ class FilterModifierWidget(forms.Widget):
|
|||||||
"""
|
"""
|
||||||
template_name = 'widgets/filter_modifier.html'
|
template_name = 'widgets/filter_modifier.html'
|
||||||
|
|
||||||
def __init__(self, original_widget, lookups, attrs=None):
|
def __init__(self, widget, lookups, attrs=None):
|
||||||
"""
|
"""
|
||||||
Args:
|
Args:
|
||||||
original_widget: The widget being wrapped (e.g., TextInput, NumberInput)
|
widget: The widget being wrapped (e.g., TextInput, NumberInput)
|
||||||
lookups: List of (lookup_code, label) tuples (e.g., [('exact', 'Is'), ('ic', 'Contains')])
|
lookups: List of (lookup_code, label) tuples (e.g., [('exact', 'Is'), ('ic', 'Contains')])
|
||||||
attrs: Additional widget attributes
|
attrs: Additional widget attributes
|
||||||
"""
|
"""
|
||||||
self.original_widget = original_widget
|
self.original_widget = widget
|
||||||
self.lookups = lookups
|
self.lookups = lookups
|
||||||
super().__init__(attrs or getattr(original_widget, 'attrs', {}))
|
super().__init__(attrs or getattr(widget, 'attrs', {}))
|
||||||
|
|
||||||
def value_from_datadict(self, data, files, name):
|
def value_from_datadict(self, data, files, name):
|
||||||
"""
|
"""
|
||||||
|
|||||||
@ -21,7 +21,7 @@ class FilterModifierWidgetTest(TestCase):
|
|||||||
This is critical for form redisplay after validation errors.
|
This is critical for form redisplay after validation errors.
|
||||||
"""
|
"""
|
||||||
widget = FilterModifierWidget(
|
widget = FilterModifierWidget(
|
||||||
original_widget=forms.TextInput(),
|
widget=forms.TextInput(),
|
||||||
lookups=[('exact', 'Is'), ('ic', 'Contains'), ('isw', 'Starts With')]
|
lookups=[('exact', 'Is'), ('ic', 'Contains'), ('isw', 'Starts With')]
|
||||||
)
|
)
|
||||||
data = QueryDict('serial__ic=test123')
|
data = QueryDict('serial__ic=test123')
|
||||||
@ -33,7 +33,7 @@ class FilterModifierWidgetTest(TestCase):
|
|||||||
def test_value_from_datadict_handles_exact_match(self):
|
def test_value_from_datadict_handles_exact_match(self):
|
||||||
"""Widget should detect exact match when field name has no modifier."""
|
"""Widget should detect exact match when field name has no modifier."""
|
||||||
widget = FilterModifierWidget(
|
widget = FilterModifierWidget(
|
||||||
original_widget=forms.TextInput(),
|
widget=forms.TextInput(),
|
||||||
lookups=[('exact', 'Is'), ('ic', 'Contains')]
|
lookups=[('exact', 'Is'), ('ic', 'Contains')]
|
||||||
)
|
)
|
||||||
data = QueryDict('serial=test456')
|
data = QueryDict('serial=test456')
|
||||||
@ -45,7 +45,7 @@ class FilterModifierWidgetTest(TestCase):
|
|||||||
def test_value_from_datadict_returns_none_when_no_value(self):
|
def test_value_from_datadict_returns_none_when_no_value(self):
|
||||||
"""Widget should return None when no data present to avoid appearing in changed_data."""
|
"""Widget should return None when no data present to avoid appearing in changed_data."""
|
||||||
widget = FilterModifierWidget(
|
widget = FilterModifierWidget(
|
||||||
original_widget=forms.TextInput(),
|
widget=forms.TextInput(),
|
||||||
lookups=[('exact', 'Is'), ('ic', 'Contains')]
|
lookups=[('exact', 'Is'), ('ic', 'Contains')]
|
||||||
)
|
)
|
||||||
data = QueryDict('')
|
data = QueryDict('')
|
||||||
@ -57,7 +57,7 @@ class FilterModifierWidgetTest(TestCase):
|
|||||||
def test_get_context_includes_original_widget_and_lookups(self):
|
def test_get_context_includes_original_widget_and_lookups(self):
|
||||||
"""Widget context should include original widget context and lookup choices."""
|
"""Widget context should include original widget context and lookup choices."""
|
||||||
widget = FilterModifierWidget(
|
widget = FilterModifierWidget(
|
||||||
original_widget=forms.TextInput(),
|
widget=forms.TextInput(),
|
||||||
lookups=[('exact', 'Is'), ('ic', 'Contains'), ('isw', 'Starts With')]
|
lookups=[('exact', 'Is'), ('ic', 'Contains'), ('isw', 'Starts With')]
|
||||||
)
|
)
|
||||||
value = 'test'
|
value = 'test'
|
||||||
@ -76,7 +76,7 @@ class FilterModifierWidgetTest(TestCase):
|
|||||||
def test_widget_renders_modifier_dropdown_and_input(self):
|
def test_widget_renders_modifier_dropdown_and_input(self):
|
||||||
"""Widget should render modifier dropdown alongside original input."""
|
"""Widget should render modifier dropdown alongside original input."""
|
||||||
widget = FilterModifierWidget(
|
widget = FilterModifierWidget(
|
||||||
original_widget=forms.TextInput(),
|
widget=forms.TextInput(),
|
||||||
lookups=[('exact', 'Is'), ('ic', 'Contains')]
|
lookups=[('exact', 'Is'), ('ic', 'Contains')]
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user