Skip to content

Added includeExtension flag to template resolution with absolute URIs #9961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 24, 2016
Merged

Added includeExtension flag to template resolution with absolute URIs #9961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion grails-web-common/src/main/groovy/grails/web/pages/GroovyPagesUriService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public interface GroovyPagesUriService {

String getTemplateURI(String controllerName, String templateName, boolean includeExtension);

String getAbsoluteTemplateURI(String templateName);
String getAbsoluteTemplateURI(String templateName, boolean includeExtension);

String getAbsoluteViewURI(String viewName);

Expand Down
11 changes: 8 additions & 3 deletions grails-web-common/src/main/groovy/org/grails/web/pages/GroovyPagesUriSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,13 @@ public String getTemplateURI(String controllerName, String templateName) {
* Obtains the URI to a template using the controller name and template name
* @param controllerName The controller name
* @param templateName The template name
* @param includeExtension The flag to include the template extension
* @return The template URI
*/
@Override
public String getTemplateURI(String controllerName, String templateName, boolean includeExtension) {
if (templateName.startsWith(SLASH_STR)) {
return getAbsoluteTemplateURI(templateName);
return getAbsoluteTemplateURI(templateName, includeExtension);
}

FastStringWriter buf = new FastStringWriter();
Expand Down Expand Up @@ -147,9 +148,10 @@ public String getTemplateURI(String controllerName, String templateName, boolean
* Used to resolve template names that are not relative to a controller.
*
* @param templateName The template name normally beginning with /
* @param includeExtension The flag to include the template extension
* @return The template URI
*/
public String getAbsoluteTemplateURI(String templateName) {
public String getAbsoluteTemplateURI(String templateName, boolean includeExtension) {
FastStringWriter buf = new FastStringWriter();
String tmp = templateName.substring(1,templateName.length());
if (tmp.indexOf(SLASH) > -1) {
Expand All @@ -163,7 +165,10 @@ public String getAbsoluteTemplateURI(String templateName) {
buf.append(SLASH_UNDR);
buf.append(templateName.substring(1,templateName.length()));
}
String uri = buf.append(EXTENSION).toString();
if (includeExtension) {
buf.append(EXTENSION);
}
String uri = buf.toString();
buf.close();
return uri;
}
Expand Down
8 changes: 4 additions & 4 deletions grails-web-gsp/src/main/groovy/org/grails/web/gsp/io/GrailsConventionGroovyPageLocator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ public GroovyPageScriptSource findTemplateInBinding(Object controller, String pl
if (controller == null) {
GrailsWebRequest webRequest = GrailsWebRequest.lookup();
if (webRequest == null) {
return findPageInBinding(pluginName, uriService.getAbsoluteTemplateURI(templateName), binding);
return findPageInBinding(pluginName, uriService.getAbsoluteTemplateURI(templateName, true), binding);
}
return findPageInBinding(pluginName, uriService.getTemplateURI(webRequest.getControllerName(), templateName), binding);
}
Expand Down Expand Up @@ -285,7 +285,7 @@ public GroovyPageScriptSource findTemplateInBinding(Object controller, String pl
public GroovyPageScriptSource findTemplateInBinding(String templateName, TemplateVariableBinding binding) {
GrailsWebRequest webRequest = GrailsWebRequest.lookup();
if (webRequest == null) {
return findPageInBinding(uriService.getAbsoluteTemplateURI(templateName), binding);
return findPageInBinding(uriService.getAbsoluteTemplateURI(templateName, true), binding);
}
return findPageInBinding(uriService.getTemplateURI(webRequest.getControllerName(), templateName), binding);
}
Expand All @@ -301,7 +301,7 @@ public GroovyPageScriptSource findTemplateInBinding(String templateName, Templat
public GroovyPageScriptSource findTemplateInBinding(String pluginName, String templateName, TemplateVariableBinding binding) {
GrailsWebRequest webRequest = GrailsWebRequest.lookup();
if (webRequest == null) {
return findPageInBinding(pluginName, uriService.getAbsoluteTemplateURI(templateName), binding);
return findPageInBinding(pluginName, uriService.getAbsoluteTemplateURI(templateName, true), binding);
}
return findPageInBinding(pluginName, uriService.getTemplateURI(webRequest.getControllerName(), templateName), binding);
}
Expand All @@ -314,7 +314,7 @@ public GroovyPageScriptSource findTemplateInBinding(String pluginName, String te
* @return The script source
*/
public GroovyPageScriptSource findTemplateByPath(String uri) {
return findPage(uriService.getAbsoluteTemplateURI(uri));
return findPage(uriService.getAbsoluteTemplateURI(uri, true));
}

protected String lookupRequestFormat() {
Expand Down