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 #904] [MERGED] Fix #235: Enable global vlan #12135

New Issue
Closed
opened 2025-12-29 22:19:49 +01:00 by adam · 0 comments
adam commented 2025-12-29 22:19:49 +01:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/netbox-community/netbox/pull/904
Author: @peng-shawn
Created: 2/19/2017
Status: ✅ Merged
Merged: 2/21/2017
Merged by: @jeremystretch

Base: global-vlans ← Head: global_vlan

📝 Commits (6)

📊 Changes

5 files changed (+73 additions, -17 deletions)

View changed files

📝 netbox/ipam/filters.py (+20 -4)
📝 netbox/ipam/forms.py (+10 -7)
➕ netbox/ipam/migrations/0015_auto_20170219_0726.py (+26 -0)
📝 netbox/ipam/models.py (+5 -4)
📝 netbox/templates/ipam/vlan.html (+12 -2)

📄 Description

Decouple site/vlan, make site optional for vlan/vlangroup
Change html generation code to check site existence before
dereference
Create site search function, if site is None for a VLAN, view it as
global VLAN

🔄 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/904 **Author:** [@peng-shawn](https://github.com/peng-shawn) **Created:** 2/19/2017 **Status:** ✅ Merged **Merged:** 2/21/2017 **Merged by:** [@jeremystretch](https://github.com/jeremystretch) **Base:** `global-vlans` ← **Head:** `global_vlan` --- ### 📝 Commits (6) - [`a9c5d45`](https://github.com/netbox-community/netbox/commit/a9c5d458a71d396ad5adce5ff6be3b46808cd6d5) Fix #235: Enable global vlan - [`64ec4db`](https://github.com/netbox-community/netbox/commit/64ec4db4f0bb6db6ef4307e436c92893b958afee) commit1 - [`05ca4da`](https://github.com/netbox-community/netbox/commit/05ca4daa76b5570cb19ff3454f4007645656ef14) commit2 - [`f7ef411`](https://github.com/netbox-community/netbox/commit/f7ef4114c0940efdbfc774007e5869c0cf0ab323) commit3 - [`07f52dd`](https://github.com/netbox-community/netbox/commit/07f52dd30053de39cefca2ae0aecc1ec05e1b820) Add migration file for VLAN&VLAN group - [`5f38618`](https://github.com/netbox-community/netbox/commit/5f386180dac7834611c606804d8a79284a6e8d89) Revert unintentional commits ### 📊 Changes **5 files changed** (+73 additions, -17 deletions) <details> <summary>View changed files</summary> 📝 `netbox/ipam/filters.py` (+20 -4) 📝 `netbox/ipam/forms.py` (+10 -7) ➕ `netbox/ipam/migrations/0015_auto_20170219_0726.py` (+26 -0) 📝 `netbox/ipam/models.py` (+5 -4) 📝 `netbox/templates/ipam/vlan.html` (+12 -2) </details> ### 📄 Description Decouple site/vlan, make site optional for vlan/vlangroup Change html generation code to check site existence before dereference Create site search function, if site is None for a VLAN, view it as global VLAN --- <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:19:49 +01:00
adam closed this issue 2025-12-29 22:19:49 +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#12135
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?