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

[PR #15327] [MERGED] Closes #15277: Standardize names & model for ContentType ForeignKeys #14574

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

📋 Pull Request Information

Original PR: https://github.com/netbox-community/netbox/pull/15327
Author: @jeremystretch
Created: 3/1/2024
Status: ✅ Merged
Merged: 3/6/2024
Merged by: @jeremystretch

Base: feature ← Head: 15277-object-types

📝 Commits (10+)

  • 0df68bf Rename ContentType proxy model to ObjectType
  • aeeec28 Rename CustomField.content_types to object_types & use ObjectType proxy
  • 54b9d1b Disconnect search backend during test to avoid discrepancy with ContentTypes on transaction rollback
  • ba514ac Rename CustomLink.content_types to object_types & use ObjectType proxy
  • e51d71d Rename EventRule.content_types to object_types & use ObjectType proxy
  • bef17e5 Rename ExportTemplate.content_types to object_types & use ObjectType proxy
  • ce6b266 Rename SavedFilter.content_types to object_types & use ObjectType proxy
  • e016553 Rename ImageAttachment.content_type to object_type
  • 5f43eab Rename ContactAssignment.content_type to object_type
  • 570f647 Update Tag.object_types to reference ObjectType

📊 Changes

99 files changed (+855 additions, -651 deletions)

View changed files

📝 netbox/core/forms/filtersets.py (+1 -1)
📝 netbox/core/management/commands/nbshell.py (+2 -2)
📝 netbox/core/migrations/0008_contenttype_proxy.py (+2 -4)
📝 netbox/core/models/contenttypes.py (+6 -6)
📝 netbox/core/models/jobs.py (+3 -3)
📝 netbox/dcim/models/cables.py (+6 -6)
📝 netbox/dcim/tests/test_models.py (+3 -3)
📝 netbox/dcim/tests/test_views.py (+0 -2)
📝 netbox/extras/api/customfields.py (+5 -5)
📝 netbox/extras/api/serializers.py (+1 -1)
📝 netbox/extras/api/serializers_/attachments.py (+6 -6)
📝 netbox/extras/api/serializers_/bookmarks.py (+2 -2)
📝 netbox/extras/api/serializers_/customfields.py (+5 -5)
📝 netbox/extras/api/serializers_/customlinks.py (+4 -4)
📝 netbox/extras/api/serializers_/events.py (+5 -5)
📝 netbox/extras/api/serializers_/exporttemplates.py (+4 -4)
📝 netbox/extras/api/serializers_/journaling.py (+2 -2)
📝 netbox/extras/api/serializers_/objecttypes.py (+5 -5)
📝 netbox/extras/api/serializers_/savedfilters.py (+4 -4)
📝 netbox/extras/api/serializers_/tags.py (+2 -2)

...and 79 more files

📄 Description

Fixes: #15277

  • Rename ContentType proxy model to ObjectType
  • Rename all non-GFK ContentType relational fields to object_type (FK) or object_types (M2M)
  • Rename all content_types filters to object_type
  • Move the /api/extras/content-types/ REST API endpoint to /api/extras/object-types/

🔄 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/15327 **Author:** [@jeremystretch](https://github.com/jeremystretch) **Created:** 3/1/2024 **Status:** ✅ Merged **Merged:** 3/6/2024 **Merged by:** [@jeremystretch](https://github.com/jeremystretch) **Base:** `feature` ← **Head:** `15277-object-types` --- ### 📝 Commits (10+) - [`0df68bf`](https://github.com/netbox-community/netbox/commit/0df68bf29180a3fab599bf3f828821560d622dd2) Rename ContentType proxy model to ObjectType - [`aeeec28`](https://github.com/netbox-community/netbox/commit/aeeec284a5d55cc70acff5628e4d0aa46589c892) Rename CustomField.content_types to object_types & use ObjectType proxy - [`54b9d1b`](https://github.com/netbox-community/netbox/commit/54b9d1b3f235b8212c73717173e1e7aa7e638b6e) Disconnect search backend during test to avoid discrepancy with ContentTypes on transaction rollback - [`ba514ac`](https://github.com/netbox-community/netbox/commit/ba514aceac778122049998c113e912d83b359d9b) Rename CustomLink.content_types to object_types & use ObjectType proxy - [`e51d71d`](https://github.com/netbox-community/netbox/commit/e51d71d7e6dca05fc5d10eca4c59366263e13179) Rename EventRule.content_types to object_types & use ObjectType proxy - [`bef17e5`](https://github.com/netbox-community/netbox/commit/bef17e5a9511fce2646d669be7f4ce6f583e7319) Rename ExportTemplate.content_types to object_types & use ObjectType proxy - [`ce6b266`](https://github.com/netbox-community/netbox/commit/ce6b2666a99f11127827dd6c17f5da58ed979c23) Rename SavedFilter.content_types to object_types & use ObjectType proxy - [`e016553`](https://github.com/netbox-community/netbox/commit/e0165539b31119d3ef0f670e7636d7255bfc3a11) Rename ImageAttachment.content_type to object_type - [`5f43eab`](https://github.com/netbox-community/netbox/commit/5f43eabab1a5f727fc98ec6ba297b52d09788917) Rename ContactAssignment.content_type to object_type - [`570f647`](https://github.com/netbox-community/netbox/commit/570f64784fd100bedbca9ab8b113677670ab10b0) Update Tag.object_types to reference ObjectType ### 📊 Changes **99 files changed** (+855 additions, -651 deletions) <details> <summary>View changed files</summary> 📝 `netbox/core/forms/filtersets.py` (+1 -1) 📝 `netbox/core/management/commands/nbshell.py` (+2 -2) 📝 `netbox/core/migrations/0008_contenttype_proxy.py` (+2 -4) 📝 `netbox/core/models/contenttypes.py` (+6 -6) 📝 `netbox/core/models/jobs.py` (+3 -3) 📝 `netbox/dcim/models/cables.py` (+6 -6) 📝 `netbox/dcim/tests/test_models.py` (+3 -3) 📝 `netbox/dcim/tests/test_views.py` (+0 -2) 📝 `netbox/extras/api/customfields.py` (+5 -5) 📝 `netbox/extras/api/serializers.py` (+1 -1) 📝 `netbox/extras/api/serializers_/attachments.py` (+6 -6) 📝 `netbox/extras/api/serializers_/bookmarks.py` (+2 -2) 📝 `netbox/extras/api/serializers_/customfields.py` (+5 -5) 📝 `netbox/extras/api/serializers_/customlinks.py` (+4 -4) 📝 `netbox/extras/api/serializers_/events.py` (+5 -5) 📝 `netbox/extras/api/serializers_/exporttemplates.py` (+4 -4) 📝 `netbox/extras/api/serializers_/journaling.py` (+2 -2) 📝 `netbox/extras/api/serializers_/objecttypes.py` (+5 -5) 📝 `netbox/extras/api/serializers_/savedfilters.py` (+4 -4) 📝 `netbox/extras/api/serializers_/tags.py` (+2 -2) _...and 79 more files_ </details> ### 📄 Description ### Fixes: #15277 - Rename `ContentType` proxy model to `ObjectType` - Rename all non-GFK ContentType relational fields to `object_type` (FK) or `object_types` (M2M) - Rename all `content_types` filters to `object_type` - Move the `/api/extras/content-types/` REST API endpoint to `/api/extras/object-types/` --- <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:16 +01:00
adam closed this issue 2025-12-29 23:25:16 +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#14574
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?