From 9068ca8340b6cac8c87ed7137eec533e11cd706d Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 23 Sep 2024 13:18:49 -0400 Subject: [PATCH] Fixes #142: Fix tab record counts for archived branches --- netbox_branching/models/branches.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/netbox_branching/models/branches.py b/netbox_branching/models/branches.py index 60c389c..be5712d 100644 --- a/netbox_branching/models/branches.py +++ b/netbox_branching/models/branches.py @@ -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( @@ -212,7 +214,7 @@ 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) @@ -220,7 +222,7 @@ 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