Skip to content
Snippets Groups Projects
Commit 8f564137 authored by Martin Lowe's avatar Martin Lowe :flag_ca:
Browse files

Fix status page render fail due to new HTML isolation during render

When using the Qute engine, there is a change in how the engine works
from 3.2 to 3.8 where user-defined tags are now isolated from the
original context by default. This broke the HTML page wrapper used in
the status UI, and once disabled the page was again able to render.
parent cdf33208
No related branches found
No related tags found
1 merge request!189Fix status page render fail due to new HTML isolation during render
CREATE DATABASE dev_eclipse_eca; CREATE DATABASE IF NOT EXISTS dev_eclipse_eca;
USE dev_eclipse_eca; USE dev_eclipse_eca;
CREATE TABLE IF NOT EXISTS `CommitValidationMessage` ( CREATE TABLE IF NOT EXISTS `CommitValidationMessage` (
......
...@@ -50,6 +50,7 @@ import jakarta.ws.rs.core.UriInfo; ...@@ -50,6 +50,7 @@ import jakarta.ws.rs.core.UriInfo;
public class StatusResource extends CommonResource { public class StatusResource extends CommonResource {
// parameter names for the status error page // parameter names for the status error page
private static final String COMMIT_STATUSES_PARAMETER = "statuses";
private static final String INCLUDE_INSTALL_LINK_PARAMETER = "includeInstallLink"; private static final String INCLUDE_INSTALL_LINK_PARAMETER = "includeInstallLink";
private static final String MESSAGE_PARAMETER = "message"; private static final String MESSAGE_PARAMETER = "message";
private static final String PULL_REQUEST_NUMBER_PARAMETER = "pullRequestNumber"; private static final String PULL_REQUEST_NUMBER_PARAMETER = "pullRequestNumber";
...@@ -106,7 +107,7 @@ public class StatusResource extends CommonResource { ...@@ -106,7 +107,7 @@ public class StatusResource extends CommonResource {
return Response return Response
.ok() .ok()
.entity(statusUiTemplate .entity(statusUiTemplate
.data("statuses", statuses) .data(COMMIT_STATUSES_PARAMETER, statuses)
.data(PULL_REQUEST_NUMBER_PARAMETER, null) .data(PULL_REQUEST_NUMBER_PARAMETER, null)
.data("fullRepoName", null) .data("fullRepoName", null)
.data("project", ps.isEmpty() ? null : ps.get(0)) .data("project", ps.isEmpty() ? null : ps.get(0))
...@@ -183,7 +184,7 @@ public class StatusResource extends CommonResource { ...@@ -183,7 +184,7 @@ public class StatusResource extends CommonResource {
return Response return Response
.ok() .ok()
.entity(statusUiTemplate .entity(statusUiTemplate
.data("statuses", statuses) .data(COMMIT_STATUSES_PARAMETER, statuses)
.data(PULL_REQUEST_NUMBER_PARAMETER, prNo) .data(PULL_REQUEST_NUMBER_PARAMETER, prNo)
.data("fullRepoName", repoFullName) .data("fullRepoName", repoFullName)
.data("project", ps.isEmpty() ? null : ps.get(0)) .data("project", ps.isEmpty() ? null : ps.get(0))
......
{#eclipse_base title='Git ECA Validation'} {#eclipse_base title='Git ECA Validation' _unisolated}
{#precontent} {#precontent}
{#include eclipse_breadcrumb}{/} {#include eclipse_breadcrumb}{/}
{|<style> {|<style>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<h1>Git ECA Validation Status</h1> <h1>Git ECA Validation Status</h1>
<div class="row"> <div class="row">
<div class="col-md-24 margin-bottom-20"> <div class="col-md-24 margin-bottom-20">
{#if (statuses.0.estimatedLoc ne null && statuses.0.estimatedLoc gt 1000) || statuses.0.provider == ProviderType:GITLAB} {#if !statuses.isEmpty && ((statuses.0.estimatedLoc ne null && statuses.0.estimatedLoc gt 1000) || statuses.0.provider == ProviderType:GITLAB)}
<div class="alert alert-info"> <div class="alert alert-info">
<p> <p>
<strong>Eclipse Intellectual Property Management:</strong> <strong>Eclipse Intellectual Property Management:</strong>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment