Skip to content

Fixes #142: Fix tab record counts for archived branches #146

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
Sep 24, 2024
Merged

Fixes #142: Fix tab record counts for archived branches #146

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
6 changes: 4 additions & 2 deletions netbox_branching/models/branches.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,8 @@ def get_unsynced_changes(self):
"""
Return a queryset of all ObjectChange records created in main since the Branch was last synced or created.
"""
if self.status not in BranchStatusChoices.WORKING:
return ObjectChange.objects.none()
return ObjectChange.objects.using(DEFAULT_DB_ALIAS).exclude(
application__branch=self
).filter(
Expand All @@ -212,15 +214,15 @@ def get_unmerged_changes(self):
"""
Return a queryset of all unmerged ObjectChange records within the Branch schema.
"""
if self.status == BranchStatusChoices.MERGED:
if self.status not in BranchStatusChoices.WORKING:
return ObjectChange.objects.none()
return ObjectChange.objects.using(self.connection_name)

def get_merged_changes(self):
"""
Return a queryset of all merged ObjectChange records for the Branch.
"""
if self.status != BranchStatusChoices.MERGED:
if self.status not in (BranchStatusChoices.MERGED, BranchStatusChoices.ARCHIVED):
return ObjectChange.objects.none()
return ObjectChange.objects.using(DEFAULT_DB_ALIAS).filter(
application__branch=self
Expand Down