Fixes GrailsView getG() override issue

Closes gh-14
graceframework · Oct 11, 2024 · 410ccef · 410ccef
1 parent 6016b80
commit 410ccef
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 11 deletions.
diff --git a/component/src/main/groovy/grails/plugin/component/view/api/ComponentView.groovy b/component/src/main/groovy/grails/plugin/component/view/api/ComponentView.groovy
@@ -1,6 +1,9 @@
 package grails.plugin.component.view.api
 
 import grails.views.api.GrailsView
+import grails.views.api.GrailsViewHelper
+import grails.views.api.internal.DefaultGrailsViewHelper
+
 /**
  * Extra methods added to markup views
  *
@@ -9,4 +12,13 @@ import grails.views.api.GrailsView
  */
 trait ComponentView extends GrailsView {
 
+    private GrailsViewHelper viewHelper = new DefaultGrailsViewHelper(this)
+
+    /**
+     * @return Obtain the view helper
+     */
+    GrailsViewHelper getG() {
+        return this.viewHelper
+    }
+
 }
diff --git a/core/src/main/groovy/grails/views/api/GrailsView.groovy b/core/src/main/groovy/grails/views/api/GrailsView.groovy
@@ -6,7 +6,6 @@ import grails.views.GrailsViewTemplate
 import grails.views.ResolvableGroovyTemplateEngine
 import grails.views.WritableScript
 import grails.views.WriterProvider
-import grails.views.api.internal.DefaultGrailsViewHelper
 import grails.web.mapping.LinkGenerator
 import grails.web.mime.MimeUtility
 import groovy.transform.CompileStatic
@@ -92,15 +91,6 @@ trait GrailsView extends HttpView implements WriterProvider, WritableScript {
      */
     Config config
 
-    private GrailsViewHelper viewHelper = new DefaultGrailsViewHelper(this)
-
-    /**
-     * @return Obtain the view helper
-     */
-    GrailsViewHelper getG() {
-        return this.viewHelper
-    }
-
     /**
      * Defines the model
      *

diff --git a/json/src/main/groovy/grails/plugin/json/view/api/JsonView.groovy b/json/src/main/groovy/grails/plugin/json/view/api/JsonView.groovy
@@ -54,7 +54,6 @@ trait JsonView extends GrailsView {
     /**
      * @return The default view helper
      */
-    @Override
     GrailsJsonViewHelper getG() {
         return viewHelper
     }

diff --git a/markup/src/main/groovy/grails/plugin/markup/view/api/MarkupView.groovy b/markup/src/main/groovy/grails/plugin/markup/view/api/MarkupView.groovy
@@ -1,6 +1,9 @@
 package grails.plugin.markup.view.api
 
 import grails.views.api.GrailsView
+import grails.views.api.GrailsViewHelper
+import grails.views.api.internal.DefaultGrailsViewHelper
+
 /**
  * Extra methods added to markup views
  *
@@ -9,4 +12,13 @@ import grails.views.api.GrailsView
  */
 trait MarkupView extends GrailsView {
 
+    private GrailsViewHelper viewHelper = new DefaultGrailsViewHelper(this)
+
+    /**
+     * @return Obtain the view helper
+     */
+    GrailsViewHelper getG() {
+        return this.viewHelper
+    }
+
 }