Fix check that alerts have attributes for compatibility with v2 alerts still in system

This commit is contained in:
Ian Renton
2026-09-25 07:10:50 +01:00
parent aee0b01d0d
commit e2267ba27f
9 changed files with 16 additions and 16 deletions
+1 -1
View File
@@ -422,7 +422,7 @@ class Spot:
now = datetime.now(pytz.UTC).timestamp() now = datetime.now(pytz.UTC).timestamp()
for alert in DATA_STORE.alerts.values(): for alert in DATA_STORE.alerts.values():
if ( if (
alert.activities hasattr(alert, "activities") # Reject any v2 alerts still in database
and ActivityName.DXPEDITION in alert.activities and ActivityName.DXPEDITION in alert.activities
and alert.dx_calls and alert.dx_calls
and alert.start_time and alert.start_time
+1 -1
View File
@@ -77,7 +77,7 @@
</div> </div>
<script src="/static/js/add-spot.js?v=1790228319"></script> <script src="/static/js/add-spot.js?v=1790316650"></script>
<script>$(document).ready(function () { <script>$(document).ready(function () {
$("#nav-link-add-spot").addClass("active"); $("#nav-link-add-spot").addClass("active");
}); <!-- highlight active page in nav --></script> }); <!-- highlight active page in nav --></script>
+1 -1
View File
@@ -85,7 +85,7 @@
</div> </div>
<script src="/static/js/alerts.js?v=1790228319"></script> <script src="/static/js/alerts.js?v=1790316650"></script>
<script>$(document).ready(function () { <script>$(document).ready(function () {
$("#nav-link-alerts").addClass("active"); $("#nav-link-alerts").addClass("active");
}); <!-- highlight active page in nav --></script> }); <!-- highlight active page in nav --></script>
+2 -2
View File
@@ -76,8 +76,8 @@
</div> </div>
<script src="/static/js/spotsbandsandmap.js?v=1790228319"></script> <script src="/static/js/spotsbandsandmap.js?v=1790316650"></script>
<script src="/static/js/bands.js?v=1790228319"></script> <script src="/static/js/bands.js?v=1790316650"></script>
<script>$(document).ready(function () { <script>$(document).ready(function () {
$("#nav-link-bands").addClass("active"); $("#nav-link-bands").addClass("active");
}); <!-- highlight active page in nav --></script> }); <!-- highlight active page in nav --></script>
+5 -5
View File
@@ -1,6 +1,6 @@
{% extends "skeleton.html" %} {% extends "skeleton.html" %}
{% block head_extra %} {% block head_extra %}
<link rel="stylesheet" href="/static/css/style.css?v=1790228319" type="text/css"> <link rel="stylesheet" href="/static/css/style.css?v=1790316650" type="text/css">
<link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet"> <link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
<link href="/static/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet"> <link href="/static/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
<link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet"> <link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -16,10 +16,10 @@
window.fetchEventSource = fetchEventSource; window.fetchEventSource = fetchEventSource;
</script> </script>
<script src="/static/js/utils.js?v=1790228319"></script> <script src="/static/js/utils.js?v=1790316650"></script>
<script src="/static/js/ui-ham.js?v=1790228319"></script> <script src="/static/js/ui-ham.js?v=1790316650"></script>
<script src="/static/js/geo.js?v=1790228319"></script> <script src="/static/js/geo.js?v=1790316650"></script>
<script src="/static/js/common.js?v=1790228319"></script> <script src="/static/js/common.js?v=1790316650"></script>
{% end %} {% end %}
{% block body %} {% block body %}
<div class="container"> <div class="container">
+1 -1
View File
@@ -284,7 +284,7 @@
</div> </div>
<script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script> <script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script>
<script src="/static/js/conditions.js?v=1790228319"></script> <script src="/static/js/conditions.js?v=1790316650"></script>
<script>$(document).ready(function () { <script>$(document).ready(function () {
$("#nav-link-conditions").addClass("active"); $("#nav-link-conditions").addClass("active");
}); <!-- highlight active page in nav --></script> }); <!-- highlight active page in nav --></script>
+2 -2
View File
@@ -113,8 +113,8 @@
const CARTODB_API_KEY = "{{ web_ui_options.get('cartodb_api_key', '') }}"; const CARTODB_API_KEY = "{{ web_ui_options.get('cartodb_api_key', '') }}";
</script> </script>
<script src="/static/js/spotsbandsandmap.js?v=1790228319"></script> <script src="/static/js/spotsbandsandmap.js?v=1790316650"></script>
<script src="/static/js/map.js?v=1790228319"></script> <script src="/static/js/map.js?v=1790316650"></script>
<script>$(document).ready(function () { <script>$(document).ready(function () {
$("#nav-link-map").addClass("active"); $("#nav-link-map").addClass("active");
}); <!-- highlight active page in nav --></script> }); <!-- highlight active page in nav --></script>
+2 -2
View File
@@ -125,8 +125,8 @@
</div> </div>
<script src="/static/js/spotsbandsandmap.js?v=1790228319"></script> <script src="/static/js/spotsbandsandmap.js?v=1790316650"></script>
<script src="/static/js/spots.js?v=1790228319"></script> <script src="/static/js/spots.js?v=1790316650"></script>
<script>$(document).ready(function () { <script>$(document).ready(function () {
$("#nav-link-spots").addClass("active"); $("#nav-link-spots").addClass("active");
}); <!-- highlight active page in nav --></script> }); <!-- highlight active page in nav --></script>
+1 -1
View File
@@ -96,7 +96,7 @@
</div> </div>
</div> </div>
<script src="/static/js/status.js?v=1790228319"></script> <script src="/static/js/status.js?v=1790316650"></script>
<script> <script>
$(document).ready(function () { $(document).ready(function () {
$("#nav-link-status").addClass("active"); $("#nav-link-status").addClass("active");