Skip to content

Commit d8022a0

Browse files
committed
add obsoletion filter for stats_data
1 parent f87d13d commit d8022a0

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

pontoon/base/models/locale.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,16 @@ def available(self):
6363

6464
def stats_data(self, project=None):
6565
if project is not None:
66-
query = self.filter(translatedresources__resource__project=project)
66+
query = self.filter(
67+
translatedresources__resource__project=project,
68+
translatedresources__resource__obsolete=False,
69+
)
6770
else:
6871
query = self.filter(
6972
translatedresources__resource__project__disabled=False,
7073
translatedresources__resource__project__system_project=False,
7174
translatedresources__resource__project__visibility="public",
75+
translatedresources__resource__obsolete=False,
7276
)
7377

7478
return query.annotate(

pontoon/base/models/project_locale.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ def visible(self):
3232
def stats_data(self, project=None, locale=None):
3333
if project:
3434
query = self.filter(
35-
locale__translatedresources__resource__project=project
35+
locale__translatedresources__resource__project=project,
36+
locale__translatedresources__resource__obsolete=False,
3637
).prefetch_related("locale")
3738
tr = "locale__translatedresources"
3839
elif locale:
@@ -41,6 +42,7 @@ def stats_data(self, project=None, locale=None):
4142
project__disabled=False,
4243
project__system_project=False,
4344
project__visibility="public",
45+
project__resources__obsolete=False,
4446
).prefetch_related("project")
4547
tr = "project__resources__translatedresources"
4648
return query.annotate(

0 commit comments

Comments
 (0)