diff --git a/app/portal/__init__.py b/app/portal/__init__.py index 6d75eab..d4d9df2 100644 --- a/app/portal/__init__.py +++ b/app/portal/__init__.py @@ -6,6 +6,7 @@ from flask.typing import ResponseReturnValue from jinja2 import Markup from sqlalchemy import desc, or_ +from app.alarms import alarms_for from app.models.activity import Activity from app.models.alarms import Alarm, AlarmState from app.models.bridges import Bridge @@ -91,7 +92,7 @@ def describe_brn(s: str) -> ResponseReturnValue: def total_origins_blocked() -> int: count = 0 for o in Origin.query.filter(Origin.destroyed.is_(None)).all(): - for a in o.alarms: + for a in alarms_for(o.brn): if a.aspect.startswith("origin-block-ooni-"): if a.alarm_state == AlarmState.WARNING: count += 1