Mercurial > sci

changeset 74:38bdcfb3d4f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
themes: fix worker page
author David Demelier <markand@malikania.fr>
date Tue, 24 Jan 2023 11:30:32 +0100
parents b0d1166de7d3
children 72d998f01b4b
files scid/page-workers.c themes/bulma/theme.js themes/bulma/worker.mustache
diffstat 3 files changed, 11 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/scid/page-workers.c	Tue Jan 24 10:51:48 2023 +0100
+++ b/scid/page-workers.c	Tue Jan 24 11:30:32 2023 +0100
@@ -32,11 +32,11 @@
 	json_t *worker, *jobresults;
 	char *body;
 
-	if (!(worker = db_worker_find(r->path)))
+	if (!(worker = db_worker_find(util_basename(r->fullpath))))
 		pageutil_status(r, KHTTP_404);
 	else {
 		/* Silently ignore jobs if it has failed. */
-		if ((jobresults = db_jobresult_list_by_worker(r->path)))
+		if ((jobresults = db_jobresult_list_by_worker(util_basename(r->fullpath))))
 			json_object_set_new(worker, "jobresults", jobresults);
 
 		body = theme_render("onPageWorker", worker);
--- a/themes/bulma/theme.js	Tue Jan 24 10:51:48 2023 +0100
+++ b/themes/bulma/theme.js	Tue Jan 24 11:30:32 2023 +0100
@@ -75,11 +75,11 @@
 	render(rdr, "index.mustache", "sci -- index page", data);
 }
 
-function onPageJobresults(rdr, data)
+function addResultClasses(jobresults)
 {
 	/* Add a status on failed/successful tasks. */
-	for (var i = 0; i < data.jobresults.length; ++i) {
-		var res = data.jobresults[i];
+	for (var i = 0; i < jobresults.length; ++i) {
+		var res = jobresults[i];
 
 		if (res.exitcode === 0 && res.sigcode === 0) {
 			res.textcolor = "has-text-success";
@@ -89,7 +89,11 @@
 			res.status = "failed";
 		}
 	}
+}
 
+function onPageJobresults(rdr, data)
+{
+	addResultClasses(data.jobresults);
 	render(rdr, "jobresults.mustache", "sci -- job results", data);
 }
 
@@ -102,7 +106,7 @@
 {
 	/* Similar to index page, add classes. */
 	if (typeof (data.jobresults) === "object")
-		addStatusClasses(data.jobresults);
+		addResultClasses(data.jobresults);
 
 	render(rdr, "worker.mustache", "sci -- worker", data);
 }
--- a/themes/bulma/worker.mustache	Tue Jan 24 10:51:48 2023 +0100
+++ b/themes/bulma/worker.mustache	Tue Jan 24 11:30:32 2023 +0100
@@ -27,7 +27,7 @@
 					</thead>
 					{{#jobresults}}
 					<tr>
-						<td><a href="/jobresults/{{id}}">{{id}}</a></td>
+						<td><a href="/jobresults/{{job_id}}">{{job_id}}</a></td>
 						<td><span class="tag {{textcolor}} is-light">{{status}}</span></td>
 					</tr>
 					{{/jobresults}}