starred/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-13 13:53:31 +01:00
Code Issues 273 Packages Projects Releases 10 Wiki Activity

[PR #15501] [MERGED] Closes #15462: Audit & clean up the utilities app #14604

New Issue
Closed
opened 2025-12-29 23:25:26 +01:00 by adam · 0 comments
adam commented 2025-12-29 23:25:26 +01:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/netbox-community/netbox/pull/15501
Author: @jeremystretch
Created: 3/21/2024
Status: ✅ Merged
Merged: 3/22/2024
Merged by: @jeremystretch

Base: feature ← Head: 15462-utilities-audit

📝 Commits (10+)

  • 47eaf2b Refactor get_view_name()
  • 56bd3cd Move choice sets from utilities.choices to netbox.choices
  • 766c6fe Move utilities.api.rest_api_server_error() to utilities.error_handlers.handle_rest_api_exception()
  • edd46da Remove the sha256_hash() utility function
  • 475c227 Remove unused MACAddressFilter
  • a7b8d87 Move ConfigTemplateLoader from utilities.jinja2 to extras.jinja2
  • 9efe86e custom_deconstruct() should not ignore TimeZoneField
  • 12d0429 Rename resolve_permission_ct() to resolve_permission_type()
  • e07036b Move title() from utilities.utils to utilities.string
  • af1b481 Move utilities.utils.highlight_string() to utilities.html.highlight()

📊 Changes

94 files changed (+977 additions, -939 deletions)

View changed files

📝 docs/plugins/development/navigation.md (+1 -1)
📝 netbox/circuits/views.py (+1 -1)
📝 netbox/core/models/data.py (+3 -2)
📝 netbox/core/views.py (+1 -1)
📝 netbox/dcim/filtersets.py (+1 -1)
📝 netbox/dcim/models/cables.py (+1 -1)
📝 netbox/dcim/models/device_components.py (+1 -1)
📝 netbox/dcim/models/devices.py (+1 -1)
📝 netbox/dcim/models/mixins.py (+1 -1)
📝 netbox/dcim/models/racks.py (+3 -2)
📝 netbox/dcim/svg/cables.py (+1 -1)
📝 netbox/dcim/svg/racks.py (+2 -1)
📝 netbox/dcim/tests/test_filtersets.py (+1 -2)
📝 netbox/dcim/tests/test_models.py (+1 -1)
📝 netbox/dcim/tests/test_views.py (+1 -2)
📝 netbox/dcim/views.py (+1 -1)
📝 netbox/extras/api/views.py (+1 -1)
📝 netbox/extras/choices.py (+2 -1)
📝 netbox/extras/dashboard/widgets.py (+8 -6)
📝 netbox/extras/events.py (+2 -5)

...and 74 more files

📄 Description

Closes: #15462

  • Moved the following choice sets from utilitities.choices to netbox.choices:

    • ButtonColorChoices
    • ColorChoices
    • CSVDelimiterChoices
    • ImportFormatChoices
    • ImportMethodChoices

  • Moved utilities.api.rest_api_server_error() to utilities.error_handlers.handle_rest_api_exception()

  • Moved utilities.utils.NetBoxFakeRequest to utilities.request

  • Moved utilities.utils.array_to_ranges() to utilities.data

  • Moved utilities.utils.array_to_string() to utilities.data

  • Moved utilities.utils.clean_html() to utilities.html

  • Moved utilities.utils.content_type_identifier() to utilities.object_types.object_type_identifier()

  • Moved utilities.utils.content_type_name() to utilities.object_types.object_type_name()

  • Moved utilities.utils.copy_safe_request() to utilities.request

  • Moved utilities.utils.count_related() to utilities.query

  • Moved utilities.utils.deepmerge() to utilities.data

  • Moved utilities.utils.dict_to_filter_params() to utilities.query

  • Moved utilities.utils.dict_to_querydict() to utilities.querydict

  • Moved utilities.utils.deserialize_object() to utilities.serialization

  • Moved utilities.utils.drange() to utilities.data

  • Moved utilities.utils.flatten_dict() to utilities.data

  • Moved utilities.utils.foreground_color() to utilities.html

  • Moved utilities.utils.get_viewname() to utilities.views

  • Moved utilities.utils.highlight_string() to utilities.html.highlight()

  • Moved utilities.utils.local_now() to utilities.datetime

  • Moved utilities.utils.normalize_querydict() to utilities.querydict

  • Moved utilities.utils.prepare_cloned_fields() to utilities.querydict

  • Moved utilities.utils.get_related_models() to utilities.relations

  • Moved utilities.utils.render_jinja2() to utilities.jinja2

  • Moved utilities.utils.shallow_compare_dict() to utilities.data

  • Moved utilities.utils.serialize_object() to utilities.serialization

  • Moved utilities.utils.title() to utilities.string

  • Moved utilities.utils.to_grams() to utilities.conversion

  • Moved utilities.utils.to_meters() to utilities.conversion

  • Renamed utilities.jinja2.ConfigTemplateLoader to DataFileLoader

  • Renamed utilities.permissions.resolve_permission_ct() to resolve_permission_type()

  • Removed utilities.files.sha256_hash()

  • Removed utilities.filters.MACAddressFilter (use MultiValueMACAddressFilter instead)

  • Removed utilities.utils.csv_format()

  • Removed utilities.utils.dynamic_import()

🔄 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/15501 **Author:** [@jeremystretch](https://github.com/jeremystretch) **Created:** 3/21/2024 **Status:** ✅ Merged **Merged:** 3/22/2024 **Merged by:** [@jeremystretch](https://github.com/jeremystretch) **Base:** `feature` ← **Head:** `15462-utilities-audit` --- ### 📝 Commits (10+) - [`47eaf2b`](https://github.com/netbox-community/netbox/commit/47eaf2b48b425abb6bbdb8f3fb4e0dcb41c48667) Refactor get_view_name() - [`56bd3cd`](https://github.com/netbox-community/netbox/commit/56bd3cdb179b823d51e2fb3665b164e292ebc937) Move choice sets from utilities.choices to netbox.choices - [`766c6fe`](https://github.com/netbox-community/netbox/commit/766c6fe6aec34edd8c49252d545aa0dcdc88ddcf) Move utilities.api.rest_api_server_error() to utilities.error_handlers.handle_rest_api_exception() - [`edd46da`](https://github.com/netbox-community/netbox/commit/edd46da846667357b4a1ab23a355a584662593f7) Remove the sha256_hash() utility function - [`475c227`](https://github.com/netbox-community/netbox/commit/475c227a11421f5750e182b229b26d0f9e9c19d2) Remove unused MACAddressFilter - [`a7b8d87`](https://github.com/netbox-community/netbox/commit/a7b8d877dc182fcbec89173d5ad2709edbeebd4c) Move ConfigTemplateLoader from utilities.jinja2 to extras.jinja2 - [`9efe86e`](https://github.com/netbox-community/netbox/commit/9efe86ea8dffb4a929b9165add43a7952c5e4e58) custom_deconstruct() should not ignore TimeZoneField - [`12d0429`](https://github.com/netbox-community/netbox/commit/12d0429925a66c5b80aa8e9e62e799b3646c3b9e) Rename resolve_permission_ct() to resolve_permission_type() - [`e07036b`](https://github.com/netbox-community/netbox/commit/e07036bd7951d9f0a19edff8d9bcd5d103a04bfb) Move title() from utilities.utils to utilities.string - [`af1b481`](https://github.com/netbox-community/netbox/commit/af1b48138230b6401fa54c52852f20d0b758cdf0) Move utilities.utils.highlight_string() to utilities.html.highlight() ### 📊 Changes **94 files changed** (+977 additions, -939 deletions) <details> <summary>View changed files</summary> 📝 `docs/plugins/development/navigation.md` (+1 -1) 📝 `netbox/circuits/views.py` (+1 -1) 📝 `netbox/core/models/data.py` (+3 -2) 📝 `netbox/core/views.py` (+1 -1) 📝 `netbox/dcim/filtersets.py` (+1 -1) 📝 `netbox/dcim/models/cables.py` (+1 -1) 📝 `netbox/dcim/models/device_components.py` (+1 -1) 📝 `netbox/dcim/models/devices.py` (+1 -1) 📝 `netbox/dcim/models/mixins.py` (+1 -1) 📝 `netbox/dcim/models/racks.py` (+3 -2) 📝 `netbox/dcim/svg/cables.py` (+1 -1) 📝 `netbox/dcim/svg/racks.py` (+2 -1) 📝 `netbox/dcim/tests/test_filtersets.py` (+1 -2) 📝 `netbox/dcim/tests/test_models.py` (+1 -1) 📝 `netbox/dcim/tests/test_views.py` (+1 -2) 📝 `netbox/dcim/views.py` (+1 -1) 📝 `netbox/extras/api/views.py` (+1 -1) 📝 `netbox/extras/choices.py` (+2 -1) 📝 `netbox/extras/dashboard/widgets.py` (+8 -6) 📝 `netbox/extras/events.py` (+2 -5) _...and 74 more files_ </details> ### 📄 Description ### Closes: #15462 - Moved the following choice sets from `utilitities.choices` to `netbox.choices`: - ButtonColorChoices - ColorChoices - CSVDelimiterChoices - ImportFormatChoices - ImportMethodChoices - Moved `utilities.api.rest_api_server_error()` to `utilities.error_handlers.handle_rest_api_exception()` - Moved `utilities.utils.NetBoxFakeRequest` to `utilities.request` - Moved `utilities.utils.array_to_ranges()` to `utilities.data` - Moved `utilities.utils.array_to_string()` to `utilities.data` - Moved `utilities.utils.clean_html()` to `utilities.html` - Moved `utilities.utils.content_type_identifier()` to `utilities.object_types.object_type_identifier()` - Moved `utilities.utils.content_type_name()` to `utilities.object_types.object_type_name()` - Moved `utilities.utils.copy_safe_request()` to `utilities.request` - Moved `utilities.utils.count_related()` to `utilities.query` - Moved `utilities.utils.deepmerge()` to `utilities.data` - Moved `utilities.utils.dict_to_filter_params()` to `utilities.query` - Moved `utilities.utils.dict_to_querydict()` to `utilities.querydict` - Moved `utilities.utils.deserialize_object()` to `utilities.serialization` - Moved `utilities.utils.drange()` to `utilities.data` - Moved `utilities.utils.flatten_dict()` to `utilities.data` - Moved `utilities.utils.foreground_color()` to `utilities.html` - Moved `utilities.utils.get_viewname()` to `utilities.views` - Moved `utilities.utils.highlight_string()` to `utilities.html.highlight()` - Moved `utilities.utils.local_now()` to `utilities.datetime` - Moved `utilities.utils.normalize_querydict()` to `utilities.querydict` - Moved `utilities.utils.prepare_cloned_fields()` to `utilities.querydict` - Moved `utilities.utils.get_related_models()` to `utilities.relations` - Moved `utilities.utils.render_jinja2()` to `utilities.jinja2` - Moved `utilities.utils.shallow_compare_dict()` to `utilities.data` - Moved `utilities.utils.serialize_object()` to `utilities.serialization` - Moved `utilities.utils.title()` to `utilities.string` - Moved `utilities.utils.to_grams()` to `utilities.conversion` - Moved `utilities.utils.to_meters()` to `utilities.conversion` - Renamed `utilities.jinja2.ConfigTemplateLoader` to `DataFileLoader` - Renamed `utilities.permissions.resolve_permission_ct()` to `resolve_permission_type()` - Removed `utilities.files.sha256_hash()` - Removed `utilities.filters.MACAddressFilter` (use MultiValueMACAddressFilter instead) - Removed `utilities.utils.csv_format()` - Removed `utilities.utils.dynamic_import()` --- <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 23:25:26 +01:00
adam closed this issue 2025-12-29 23:25:27 +01:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
beta
breaking change
complexity: high
complexity: low
complexity: medium
needs milestone
netbox
pending closure
plugin candidate
pull-request
Mirrored from GitHub Pull Request
 severity: high
severity: low
severity: medium
status: accepted
status: backlog
status: blocked
status: duplicate
status: needs owner
status: needs triage
status: revisions needed
status: under review
topic: GraphQL
topic: Internationalization
topic: OpenAPI
topic: UI/UX
topic: cabling
topic: event rules
topic: htmx navigation
topic: industrialization
topic: migrations
topic: plugins
topic: scripts
topic: templating
topic: testing
type: bug
type: deprecation
type: documentation
type: feature
type: housekeeping
type: translation
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
adam
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/netbox#14604
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?