Skip to content

fix: generate diff - set branch for the change set #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 24, 2025
Merged

fix: generate diff - set branch for the change set #90

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions netbox_diode_plugin/api/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,15 @@ def _post(self, request, *args, **kwargs):
)
return Response(result.to_dict(), status=result.get_status_code())

branch_id = request.headers.get("X-NetBox-Branch")
branch_schema_id = request.headers.get("X-NetBox-Branch")

# If branch ID is provided and branching plugin is installed, get branch name
if branch_id and Branch is not None:
# If branch schema ID is provided and branching plugin is installed, get branch name
if branch_schema_id and Branch is not None:
try:
branch = Branch.objects.get(id=branch_id)
result.branch = {"id": branch.id, "name": branch.name}
branch = Branch.objects.get(schema_id=branch_schema_id)
result.change_set.branch = {"id": branch.schema_id, "name": branch.name}
except Branch.DoesNotExist:
sanitized_branch_id = branch_id.replace('\n', '').replace('\r', '')
sanitized_branch_id = branch_schema_id.replace('\n', '').replace('\r', '')
logger.warning(f"Branch with ID {sanitized_branch_id} does not exist")

return Response(result.to_dict(), status=result.get_status_code())
Expand Down