From b6aab1308f4ab7d2c31e9dbaa6583e3bbe34134b Mon Sep 17 00:00:00 2001 From: Adam Cox Date: Mon, 20 Jul 2026 09:38:53 -0500 Subject: [PATCH 1/2] add links between jobs and activity pages --- ohmg/frontend/fixtures/default-navbar.json | 6 +++++- ohmg/frontend/templates/frontend/activity.html | 2 +- ohmg/frontend/templates/frontend/jobs.html | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ohmg/frontend/fixtures/default-navbar.json b/ohmg/frontend/fixtures/default-navbar.json index 1743207e..1f26657f 100644 --- a/ohmg/frontend/fixtures/default-navbar.json +++ b/ohmg/frontend/fixtures/default-navbar.json @@ -23,9 +23,13 @@ "title": "Georeferencing", "children": [ { - "title": "Latest Activity", + "title": "Latest activity", "link": "/activity" }, + { + "title": "Background jobs", + "link": "/jobs" + }, { "title": "Contributors", "link": "/profiles" diff --git a/ohmg/frontend/templates/frontend/activity.html b/ohmg/frontend/templates/frontend/activity.html index 636eb767..186738a6 100644 --- a/ohmg/frontend/templates/frontend/activity.html +++ b/ohmg/frontend/templates/frontend/activity.html @@ -6,7 +6,7 @@ {% block main_content %} -{% include '_titlebar.html' with title="Activity" lead_icon="clipboard" %} +{% include '_titlebar.html' with title="Activity" subtitle="see also: jobs" lead_icon="clipboard" %}
diff --git a/ohmg/frontend/templates/frontend/jobs.html b/ohmg/frontend/templates/frontend/jobs.html index d5675372..b4945872 100644 --- a/ohmg/frontend/templates/frontend/jobs.html +++ b/ohmg/frontend/templates/frontend/jobs.html @@ -6,7 +6,7 @@ {% block main_content %} -{% include '_titlebar.html' with title="Jobs" subtitle="see also: sessions" lead_icon="wrench" %} +{% include '_titlebar.html' with title="Jobs" subtitle="see also: activity" lead_icon="wrench" %}
From 8277c5d7bd47bf430659bcbb122d4b90f91c1a38 Mon Sep 17 00:00:00 2001 From: Adam Cox Date: Mon, 20 Jul 2026 09:39:27 -0500 Subject: [PATCH 2/2] cast setting as int --- ohmg/conf/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ohmg/conf/settings.py b/ohmg/conf/settings.py index 73ebb726..925346d0 100644 --- a/ohmg/conf/settings.py +++ b/ohmg/conf/settings.py @@ -303,7 +303,7 @@ # this will be removed once Django is upgraded SWAP_COORDINATE_ORDER = ast.literal_eval(os.getenv("SWAP_COORDINATE_ORDER", "False")) -MAX_CONCURRENT_MOSAIC_JOBS = os.getenv("MAX_CONCURRENT_MOSAIC_JOBS", 1) +MAX_CONCURRENT_MOSAIC_JOBS = int(os.getenv("MAX_CONCURRENT_MOSAIC_JOBS", 1)) # CONFIGURE CELERY CELERY_BROKER_URL = os.getenv("BROKER_URL")