Merge pull request #503 from candrews/patch-10

jeffscottbrown · jeffscottbrown · commit 1756bcc4f96c · 2014-06-19T07:24:17.000-05:00
GRAILS-11471: Don't try to resolve "*.all.gsp"
diff --git a/grails-web/src/main/groovy/org/codehaus/groovy/grails/web/pages/discovery/GrailsConventionGroovyPageLocator.java b/grails-web/src/main/groovy/org/codehaus/groovy/grails/web/pages/discovery/GrailsConventionGroovyPageLocator.java
@@ -105,7 +105,7 @@ public String resolveViewFormat(String viewName) {
     }
 
     private String getViewNameWithFormat(String viewName, String format) {
-        if (format == null) {
+        if (format == null || format.equals("all")) {
             return viewName;
         }
         return viewName + DOT + format;

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ public String resolveViewFormat(String viewName) {`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`private String getViewNameWithFormat(String viewName, String format) {`
`108`		`- if (format == null) {`
	`108`	`+ if (format == null \|\| format.equals("all")) {`
`109`	`109`	`return viewName;`
`110`	`110`	`}`
`111`	`111`	`return viewName + DOT + format;`