Support gsp in the 'app/views/'

Related commit 7ceb97e
graceframework · Sep 28, 2022 · fbf1bd1 · fbf1bd1
1 parent bedf347
commit fbf1bd1
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/grails-gsp/src/main/groovy/org/grails/gsp/io/DefaultGroovyPageLocator.java b/grails-gsp/src/main/groovy/org/grails/gsp/io/DefaultGroovyPageLocator.java
@@ -331,6 +331,7 @@ protected String removeViewLocationPrefixes(String uri) {
         uri = removePrefix(uri, GrailsResourceUtils.WEB_INF);
         uri = removePrefix(uri, SLASHED_VIEWS_DIR_PATH);
         uri = removePrefix(uri, GrailsResourceUtils.VIEWS_DIR_PATH);
+        uri = removePrefix(uri, "app/views/");
         return uri;
     }
 
@@ -358,19 +359,24 @@ protected List<String> resolveSearchPaths(String uri) {
                 searchPaths = CollectionUtils.newList(
                         GrailsResourceUtils.appendPiecesForUri(GrailsResourceUtils.WEB_INF, PLUGINS_PATH,
                                 pathInfo.pluginName, GrailsResourceUtils.VIEWS_DIR_PATH, pathInfo.path),
+                        GrailsResourceUtils.appendPiecesForUri(GrailsResourceUtils.WEB_INF, PLUGINS_PATH,
+                                pathInfo.pluginName, "app/views/", pathInfo.path),
                         GrailsResourceUtils.appendPiecesForUri(GrailsResourceUtils.WEB_INF, uri),
                         uri);
             }
             else {
                 searchPaths = CollectionUtils.newList(
                         GrailsResourceUtils.appendPiecesForUri(PATH_TO_WEB_INF_VIEWS, uri),
+                        GrailsResourceUtils.appendPiecesForUri("/WEB-INF/app/views", uri),
                         uri);
             }
         }
         else {
             searchPaths = CollectionUtils.newList(
                     GrailsResourceUtils.appendPiecesForUri(SLASHED_VIEWS_DIR_PATH, uri),
                     GrailsResourceUtils.appendPiecesForUri(PATH_TO_WEB_INF_VIEWS, uri),
+                    GrailsResourceUtils.appendPiecesForUri("/app/views/", uri),
+                    GrailsResourceUtils.appendPiecesForUri("/WEB-INF/app/views", uri),
                     uri);
         }
         return searchPaths;