From 74878c606411aba36788aed81cd422160d3473ff Mon Sep 17 00:00:00 2001 From: orenyosifon Date: Tue, 26 May 2015 16:22:29 +0300 Subject: [PATCH 1/2] fixed GPResources 267 --- src/groovy/org/grails/plugin/resource/ResourceMeta.groovy | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/groovy/org/grails/plugin/resource/ResourceMeta.groovy b/src/groovy/org/grails/plugin/resource/ResourceMeta.groovy index d36ede1..57901d1 100644 --- a/src/groovy/org/grails/plugin/resource/ResourceMeta.groovy +++ b/src/groovy/org/grails/plugin/resource/ResourceMeta.groovy @@ -373,7 +373,7 @@ class ResourceMeta { String getActualUrlParent() { def lastSlash = actualUrl.lastIndexOf('/') - if (lastSlash >= 0) { + if (lastSlash > 0) { return actualUrl[0..lastSlash-1] } else { return '' @@ -416,6 +416,9 @@ class ResourceMeta { * All resource URLs must be app-relative with no ../ or ./ */ String relativeTo(ResourceMeta base) { + if (base.is(this)){ + return actualUrl + } if (actualAbsolute) { return actualUrl } From 14608171890b3adfb93ee1c10c7bbef1ac516632 Mon Sep 17 00:00:00 2001 From: orenyosifon Date: Tue, 26 May 2015 16:44:22 +0300 Subject: [PATCH 2/2] fixed GPResources 267 --- src/groovy/org/grails/plugin/resource/ResourceMeta.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/groovy/org/grails/plugin/resource/ResourceMeta.groovy b/src/groovy/org/grails/plugin/resource/ResourceMeta.groovy index 57901d1..c1a3cd8 100644 --- a/src/groovy/org/grails/plugin/resource/ResourceMeta.groovy +++ b/src/groovy/org/grails/plugin/resource/ResourceMeta.groovy @@ -416,7 +416,7 @@ class ResourceMeta { * All resource URLs must be app-relative with no ../ or ./ */ String relativeTo(ResourceMeta base) { - if (base.is(this)){ + if (base.is(this)) { return actualUrl } if (actualAbsolute) {