Merge branch '6.2.x' into 7.0.x

Author: codeconsole

.github/workflows/gradle.yml

@@ -85,4 +85,4 @@ jobs:
           BRANCH: gh-pages
           FOLDER: build/docs
           COMMIT_EMAIL: [email protected]
-          COMMIT_NAME: grails-build
+          COMMIT_NAME: grails-build

grails-web-gsp-taglib/src/main/groovy/org/grails/plugins/web/taglib/RenderTagLib.groovy

@@ -47,6 +47,7 @@ class RenderTagLib implements TagLibrary {
      * &lt;g:render template="atemplate" bean="${user}" /&gt;<br/>
      *
      * @attr template REQUIRED The name of the template to apply
+     * @attr optional if true, this tag will be ignored when the template does not exist.
      * @attr contextPath the context path to use (relative to the application context path). Defaults to "" or path to the plugin for a plugin view or template.
      * @attr bean The bean to apply the template against
      * @attr model The model to apply the template against as a java.util.Map
@@ -75,7 +76,7 @@ class RenderTagLib implements TagLibrary {
         def currentOut = out
         int statusCode = request.getAttribute('jakarta.servlet.error.status_code') as int
         currentOut << """<h1>Error ${prettyPrintStatus(statusCode)}</h1>
-<dl class="error-details">
+<dl class="${attrs['detailsClass'] ?: 'error-details'}">
 <dt>URI</dt><dd>${htmlEncoder.encode(WebUtils.getForwardURI(request) ?: request.getAttribute('jakarta.servlet.error.request_uri'))}</dd>
 """
 
@@ -87,12 +88,12 @@ class RenderTagLib implements TagLibrary {
         }
         currentOut << "</dl>"
 
-        currentOut << errorsViewStackTracePrinter.prettyPrintCodeSnippet(exception)
+        currentOut << errorsViewStackTracePrinter.prettyPrintCodeSnippet(exception, attrs)
 
-        def trace = errorsViewStackTracePrinter.prettyPrint(exception.cause ?: exception)
+        def trace = errorsViewStackTracePrinter.prettyPrint(exception.cause ?: exception, attrs)
         if (StringUtils.hasText(trace.trim())) {
             currentOut << "<h2>Trace</h2>"
-            currentOut << '<pre class="stack">'
+            currentOut << """<pre class="${attrs['stackClass'] ?: 'stack'}">"""
             currentOut << htmlEncoder.encode(trace)
             currentOut << '</pre>'
         }

grails-web-gsp/src/main/groovy/org/grails/web/gsp/GroovyPagesTemplateRenderer.java

@@ -114,6 +114,9 @@ public void render(GrailsWebRequest webRequest, TemplateVariableBinding pageScop
         final Object controller = webRequest.getAttribute(GrailsApplicationAttributes.CONTROLLER, GrailsWebRequest.SCOPE_REQUEST);
         Template t = findAndCacheTemplate(controller, pageScope, templateName, contextPath, pluginName, uri);
         if (t == null) {
+            if (getBooleanValue(attrs, "optional")) {
+                return; // allow missing templates if optional == "true"
+            }
             throw new GrailsTagException("Template not found for name [" + templateName + "] and path [" + uri + "]");
         }
 
@@ -288,6 +291,12 @@ private String getStringValue(Map<String, Object> attrs, String key) {
         return String.valueOf(val);
     }
 
+    private boolean getBooleanValue(Map<String, Object> attrs, String key) {
+        String val = getStringValue(attrs, key);
+        if (val.isBlank()) return false;
+        return Boolean.parseBoolean(val);
+    }
+
     public void setGroovyPageLocator(GrailsConventionGroovyPageLocator locator) {
         groovyPageLocator = locator;
     }