More BasePath fixes.

Fixes #41, finally!
bsiegert · Nov 19, 2023 · ed7a48a · ed7a48a
1 parent 687a161
commit ed7a48a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/static/builddetails.js b/static/builddetails.js
@@ -33,21 +33,21 @@ bt.buildDetails.columns = [
 
 bt.buildDetails.createdRow = function (row, data) {
   $('td', row).filter((i) => i < 2)
-    .wrapInner(`<a href="/build/${data.ResultID}"></a>`);
+    .wrapInner(`<a href="${bt.basePath}build/${data.ResultID}"></a>`);
 };
 
 bt.buildDetails.init = function () {
   var buildNo = window.location.pathname.slice(-2).replaceAll("/", "");
   $('.table').dataTable({
     ajax: {
-      url: `/json/pkgsbreakingmostothers/${buildNo}`,
+      url: `${bt.basePath}json/pkgsbreakingmostothers/${buildNo}`,
       dataSrc: ""
     },
     columns: bt.buildDetails.columns,
     // createdRow: bt.buildDetails.createdRow,
     order: [[3, 'desc']],
     createdRow: function (row, data, dataIndex) {
-      $('td:eq(1)', row).wrapInner('<a href="/pkg/' + data.ResultID + '"></a>');
+      $('td:eq(1)', row).wrapInner(`<a href="${bt.basePath}pkg/${data.ResultID}"></a>`);
       $('td:eq(2)', row).addClass(classes[data.BuildStatus]);
     }
   });

diff --git a/static/builds.js b/static/builds.js
@@ -21,13 +21,13 @@ bt.builds.columns = [
 
 bt.builds.createdRow = function (row, data) {
   $('td', row).filter(function (i) { return i < 3 })
-    .wrapInner(`<a href="/build/${data.BuildID}"></a>`);
+    .wrapInner(`<a href="${bt.basePath}build/${data.BuildID}"></a>`);
 };
 
 bt.builds.init = function () {
   $('.table').dataTable({
     ajax: {
-      url: "/json/allbuilds/",
+      url: `${bt.BasePath}json/allbuilds/`,
       dataSrc: ""
     },
     columns: bt.builds.columns,

diff --git a/templates/table_builds.html b/templates/table_builds.html
@@ -1,12 +1,12 @@
       <tr>
 	<td>
-	  <a href="/build/{{.BuildID}}">{{.Date}}</a>
+	  <a href="{{.BasePath}}build/{{.BuildID}}">{{.Date}}</a>
 	</td>
 	<td>
-	  <a href="/build/{{.BuildID}}">{{.Branch}}</a>
+	  <a href="{{.BasePath}}build/{{.BuildID}}">{{.Branch}}</a>
 	</td>
 	<td>
-	  <a href="/build/{{.BuildID}}">{{.Platform}}</a>
+	  <a href="{{.BasePath}}build/{{.BuildID}}">{{.Platform}}</a>
 	</td>
 	<td>
 	  <span class="text-danger">{{.NumFailed}} failed</span> /

diff --git a/templates/templates.go b/templates/templates.go
@@ -78,7 +78,14 @@ func TableBegin(w io.Writer, columns ...string) {
 }
 
 func TableBuilds(w io.Writer, b *ddao.Build) {
-	t.ExecuteTemplate(w, "table_builds.html", b)
+	s := struct {
+		*ddao.Build
+		bp
+	}{
+		Build: b,
+		bp:    bp{},
+	}
+	t.ExecuteTemplate(w, "table_builds.html", s)
 }
 
 func TablePkgs(w io.Writer, rows []ddao.GetResultsInCategoryRow) {