From 5ecfbd260a67284b469d572fafd5890fe579277c Mon Sep 17 00:00:00 2001
From: Dale Wahl <dalewahl@gmail.com>
Date: Wed, 5 Jun 2024 09:16:31 +0200
Subject: [PATCH] fix up scheduler header

---
 backend/workers/scheduler.py     | 9 +++++----
 webtool/templates/layout.html    | 3 +++
 webtool/templates/scheduler.html | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/backend/workers/scheduler.py b/backend/workers/scheduler.py
index 8ceaa7ee7..5cf9d3214 100644
--- a/backend/workers/scheduler.py
+++ b/backend/workers/scheduler.py
@@ -22,7 +22,8 @@ class Scheduler(BasicWorker):
 	work_report = None
 	details = None
 
-	def ensure_database(self):
+	@staticmethod
+	def ensure_database(db):
 		"""
 		Ensure that the database is set up for this worker
 
@@ -35,14 +36,14 @@ def ensure_database(self):
 		details: additional details for the job (potentially different for each job)
 		"""
 		# create the table if it doesn't exist
-		self.db.execute("CREATE TABLE IF NOT EXISTS scheduled_jobs (job_id int PRIMARY KEY, scheduler_id int NOT NULL, jobtype text NOT NULL, dataset_id text NOT NULL, status text NOT NULL, created_at integer, details jsonb)")
+		db.execute("CREATE TABLE IF NOT EXISTS scheduled_jobs (job_id int PRIMARY KEY, scheduler_id int NOT NULL, jobtype text NOT NULL, dataset_id text NOT NULL, status text NOT NULL, created_at integer, details jsonb)")
 
 	def work(self):
 		"""
 		Check previous scheduled jobs and schedule new ones as necessary
 		"""
 		# TODO: ensure_database could be called when workers are validated; we could even check for packages there
-		self.ensure_database()
+		self.ensure_database(self.db)
 		# Ensure clean work report
 		self.work_report = {}
 
@@ -112,7 +113,7 @@ def schedule_job(self, first=False):
 				"processor_type": processor.type,
 				"extension": processor.get_extension(dataset.get_parent()),
 				"is_private": dataset.is_private,
-				"parameters": parameters,
+				"parameters": dataset.parameters.copy(),
 				"label": dataset.get_label(),
 				"last_dataset": dataset.key
 			})
diff --git a/webtool/templates/layout.html b/webtool/templates/layout.html
index 61a60c3b9..4c1bdcc77 100644
--- a/webtool/templates/layout.html
+++ b/webtool/templates/layout.html
@@ -40,6 +40,9 @@ <h1>
             {% endif %}
 			<li{% if navigation.current == "dataset" %} class="current"{% endif %}><a href="{{ url_for('show_results') }}">Datasets</a></li>
             <li{% if navigation.current == "datasources" %} class="current"{% endif %}><a href="{{ url_for('data_overview') }}">Data sources</a></li>
+            {% if __user_config("privileges.can_schedule_datasources") %}
+                <li{% if navigation.current == "scheduler" %} class="current"{% endif %}><a href="{{ url_for('show_scheduler') }}">Scheduler</a></li>
+            {% endif %}
             {% if current_user.is_authenticated and not current_user.is_special and __user_config("privileges.can_create_api_token") %}
                 <li{% if navigation.current == "api-access" %} class="current"{% endif %}><a href="{{ url_for('show_access_tokens') }}">API Access</a></li>
             {% endif %}
diff --git a/webtool/templates/scheduler.html b/webtool/templates/scheduler.html
index 2b6540e93..78c452cfa 100644
--- a/webtool/templates/scheduler.html
+++ b/webtool/templates/scheduler.html
@@ -2,7 +2,7 @@
 
 {% block title %}Job Scheduler{% endblock %}
 {% block body_class %}result-list plain-page{% endblock %}
-{% block breadcrumbs %}{% set navigation.current = "dataset" %}{% endblock %}
+{% block breadcrumbs %}{% set navigation.current = "scheduler" %}{% endblock %}
 
 {% block body %}
     <article>