[PR #6315] [MERGED] Closes #6314: FilterSet cleanup #13112

Closed
opened 2025-12-29 22:25:29 +01:00 by adam · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/netbox-community/netbox/pull/6315
Author: @jeremystretch
Created: 4/29/2021
Status: Merged
Merged: 4/30/2021
Merged by: @jeremystretch

Base: developHead: 6314-filterset-cleanup


📝 Commits (5)

  • 0de50e0 Split Filter and FilterSet classes
  • c4e88fd Consolidate FilterSet classes
  • d35ac13 Move TagFilter to extras
  • 1024782 Rename FilterSet modules
  • 3ef6284 Move base FilterSet classes under netbox core

📊 Changes

37 files changed (+933 additions, -924 deletions)

View changed files

📝 netbox/circuits/api/views.py (+6 -6)
📝 netbox/circuits/filtersets.py (+10 -11)
📝 netbox/circuits/tests/test_filters.py (+1 -1)
📝 netbox/circuits/views.py (+11 -11)
📝 netbox/dcim/api/views.py (+37 -37)
📝 netbox/dcim/filtersets.py (+46 -60)
📝 netbox/dcim/tests/test_filters.py (+1 -1)
📝 netbox/dcim/views.py (+80 -80)
📝 netbox/extras/api/views.py (+12 -12)
📝 netbox/extras/filters.py (+10 -358)
netbox/extras/filtersets.py (+340 -0)
📝 netbox/extras/tests/test_customfields.py (+1 -1)
📝 netbox/extras/tests/test_filters.py (+1 -1)
📝 netbox/extras/views.py (+8 -8)
📝 netbox/ipam/api/views.py (+11 -11)
📝 netbox/ipam/filtersets.py (+14 -14)
📝 netbox/ipam/tests/test_filters.py (+1 -1)
📝 netbox/ipam/views.py (+30 -30)
📝 netbox/netbox/constants.py (+6 -6)
netbox/netbox/filtersets.py (+238 -0)

...and 17 more files

📄 Description

Closes: #6314

  • Reorganizes Filter and FilterSet classes into separate modules
  • Consolidates FilterSet classes based on model type
  • Renames FilterSet modules from filters to filtersets
  • Moves core FilterSet classes under NetBox core

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/netbox-community/netbox/pull/6315 **Author:** [@jeremystretch](https://github.com/jeremystretch) **Created:** 4/29/2021 **Status:** ✅ Merged **Merged:** 4/30/2021 **Merged by:** [@jeremystretch](https://github.com/jeremystretch) **Base:** `develop` ← **Head:** `6314-filterset-cleanup` --- ### 📝 Commits (5) - [`0de50e0`](https://github.com/netbox-community/netbox/commit/0de50e0afefcb96337882116007a70d7d0e3eed4) Split Filter and FilterSet classes - [`c4e88fd`](https://github.com/netbox-community/netbox/commit/c4e88fd11a7fe73a50e234e0a83a719cbd1cca8b) Consolidate FilterSet classes - [`d35ac13`](https://github.com/netbox-community/netbox/commit/d35ac1347cebd46740188f1b294ac50499f3c1ea) Move TagFilter to extras - [`1024782`](https://github.com/netbox-community/netbox/commit/1024782b9e0abb48f6da65f8248741227d53dbed) Rename FilterSet modules - [`3ef6284`](https://github.com/netbox-community/netbox/commit/3ef6284a0d1f9245c502592d1b762240a03bd32d) Move base FilterSet classes under netbox core ### 📊 Changes **37 files changed** (+933 additions, -924 deletions) <details> <summary>View changed files</summary> 📝 `netbox/circuits/api/views.py` (+6 -6) 📝 `netbox/circuits/filtersets.py` (+10 -11) 📝 `netbox/circuits/tests/test_filters.py` (+1 -1) 📝 `netbox/circuits/views.py` (+11 -11) 📝 `netbox/dcim/api/views.py` (+37 -37) 📝 `netbox/dcim/filtersets.py` (+46 -60) 📝 `netbox/dcim/tests/test_filters.py` (+1 -1) 📝 `netbox/dcim/views.py` (+80 -80) 📝 `netbox/extras/api/views.py` (+12 -12) 📝 `netbox/extras/filters.py` (+10 -358) ➕ `netbox/extras/filtersets.py` (+340 -0) 📝 `netbox/extras/tests/test_customfields.py` (+1 -1) 📝 `netbox/extras/tests/test_filters.py` (+1 -1) 📝 `netbox/extras/views.py` (+8 -8) 📝 `netbox/ipam/api/views.py` (+11 -11) 📝 `netbox/ipam/filtersets.py` (+14 -14) 📝 `netbox/ipam/tests/test_filters.py` (+1 -1) 📝 `netbox/ipam/views.py` (+30 -30) 📝 `netbox/netbox/constants.py` (+6 -6) ➕ `netbox/netbox/filtersets.py` (+238 -0) _...and 17 more files_ </details> ### 📄 Description ### Closes: #6314 - Reorganizes Filter and FilterSet classes into separate modules - Consolidates FilterSet classes based on model type - Renames FilterSet modules from `filters` to `filtersets` - Moves core FilterSet classes under NetBox core --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
adam added the pull-request label 2025-12-29 22:25:29 +01:00
adam closed this issue 2025-12-29 22:25:29 +01:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/netbox#13112