jasima/majuna
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

portal: fix home page rendering

Browse source
This commit is contained in:
Iain Learmonth 2022-06-22 16:34:45 +01:00
parent 3da5abce92
commit 04d1f85ca9
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/portal/__init__.py
View file

@ -6,6 +6,7 @@ from flask.typing import ResponseReturnValue
from jinja2 import Markup from jinja2 import Markup
from sqlalchemy import desc, or_ from sqlalchemy import desc, or_
from app.alarms import alarms_for
from app.models.activity import Activity from app.models.activity import Activity
from app.models.alarms import Alarm, AlarmState from app.models.alarms import Alarm, AlarmState
from app.models.bridges import Bridge from app.models.bridges import Bridge
@ -91,7 +92,7 @@ def describe_brn(s: str) -> ResponseReturnValue:
def total_origins_blocked() -> int: def total_origins_blocked() -> int:
count = 0 count = 0
for o in Origin.query.filter(Origin.destroyed.is_(None)).all(): 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.aspect.startswith("origin-block-ooni-"):
if a.alarm_state == AlarmState.WARNING: if a.alarm_state == AlarmState.WARNING:
count += 1 count += 1