Merge branch '2.1.x'

grails · Sep 12, 2012 · 22efdbc · 22efdbc
2 parents 6e5a465 + 45450f4
commit 22efdbc
Show file tree

Hide file tree

Showing 4 changed files with 93 additions and 4 deletions.
diff --git a/...lugin-gsp/src/main/groovy/org/codehaus/groovy/grails/plugins/web/taglib/FormTagLib.groovy b/...lugin-gsp/src/main/groovy/org/codehaus/groovy/grails/plugins/web/taglib/FormTagLib.groovy
@@ -268,10 +268,12 @@ class FormTagLib {
     void outputAttributes(attrs, writer, boolean useNameAsIdIfIdDoesNotExist = false) {
         attrs.remove('tagName') // Just in case one is left
         attrs.each { k, v ->
-            writer << k
-            writer << '="'
-            writer << v.encodeAsHTML()
-            writer << '" '
+            if(v != null) {
+                writer << k
+                writer << '="'
+                writer << v.encodeAsHTML()
+                writer << '" '
+            }
         }
         if (useNameAsIdIfIdDoesNotExist) {
             outputNameAsIdIfIdDoesNotExist(attrs, writer)

diff --git a/...-base/src/main/groovy/org/codehaus/groovy/grails/web/taglib/AbstractGrailsTagTests.groovy b/...-base/src/main/groovy/org/codehaus/groovy/grails/web/taglib/AbstractGrailsTagTests.groovy
@@ -391,10 +391,12 @@ abstract class AbstractGrailsTagTests extends GroovyTestCase {
 
         try {
             request.setAttribute(RequestConstants.PAGE, page)
+            request.setAttribute(GrailsPageFilter.GSP_SITEMESH_PAGE, new GSPSitemeshPage())
             return applyTemplate(layout, params,null, "/layouts/test_"+System.currentTimeMillis())
         }
         finally {
             request.removeAttribute(RequestConstants.PAGE)
+            request.removeAttribute(GrailsPageFilter.GSP_SITEMESH_PAGE)
         }
     }
     /**

diff --git a/...src/test/groovy/org/codehaus/groovy/grails/web/sitemesh/FullSitemeshLifeCycleTests.groovy b/...src/test/groovy/org/codehaus/groovy/grails/web/sitemesh/FullSitemeshLifeCycleTests.groovy
@@ -2,6 +2,12 @@ package org.codehaus.groovy.grails.web.sitemesh
 
 import org.codehaus.groovy.grails.support.MockStringResourceLoader
 import org.codehaus.groovy.grails.web.taglib.AbstractGrailsTagTests
+import org.springframework.mock.web.MockServletConfig
+
+import com.opensymphony.module.sitemesh.Config
+import com.opensymphony.module.sitemesh.Decorator
+import com.opensymphony.module.sitemesh.DecoratorMapper
+import com.opensymphony.module.sitemesh.factory.BaseFactory
 
 /**
  * Tests the sitemesh capturing and rendering tags end-to-end
@@ -77,6 +83,71 @@ class FullSitemeshLifeCycleTests extends AbstractGrailsTagTests {
 ''', result
     }
 
+    static class DummySiteMeshFactory extends BaseFactory {
+        public DummySiteMeshFactory(Config config) {
+            super(config)
+        }
+
+        @Override
+        public void refresh() {
+        }
+    }
+
+    def configureSitemesh() {
+        def mockServletConfig = new MockServletConfig()
+        def siteMeshConfig = new Config(mockServletConfig)
+        def siteMeshFactory = new DummySiteMeshFactory(siteMeshConfig)
+        def decorator = {name -> [getPage: {-> "/layout/${name}.gsp".toString()}] as Decorator }
+        siteMeshFactory.decoratorMapper = [getNamedDecorator: {request, name -> decorator(name)}] as DecoratorMapper
+        FactoryHolder.factory = siteMeshFactory
+    }
+
+    void testMultipleLevelsOfLayouts() {
+        def resourceLoader = new MockStringResourceLoader()
+        resourceLoader.registerMockResource('/layout/dialog.gsp', '''<html>
+        <head><g:layoutHead /><title>Dialog - <g:layoutTitle /></title></head>
+        <body onload="${g.pageProperty(name:'body.onload')}"><div id="dialog"><g:layoutBody /></div></body>
+</html>''')
+        resourceLoader.registerMockResource('/layout/base.gsp', '''<html>
+        <head><g:layoutHead /><title>Base - <g:layoutTitle /></title></head>
+        <body onload="${g.pageProperty(name:'body.onload')}"><div id="base"><g:layoutBody /></div></body>
+</html>''')
+        appCtx.groovyPageLocator.addResourceLoader resourceLoader
+
+        configureSitemesh()
+
+        def template = '''
+<g:applyLayout name="base"><g:applyLayout name="dialog">
+<html>
+        <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>This is the title</title></head>
+        <body onload="test();">body text</body>
+</html>
+</g:applyLayout></g:applyLayout>
+'''
+        request.setAttribute(GrailsPageFilter.GSP_SITEMESH_PAGE, new GSPSitemeshPage())
+        assertOutputEquals '''
+<html>
+        <head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Base - Dialog - This is the title</title></head>
+        <body onload="test();"><div id="base"><div id="dialog">body text</div></div></body>
+</html>
+''', template
+
+        def layout = '''
+<html>
+    <head><title>Decorated <g:layoutTitle default="defaultTitle"/></title><g:layoutHead /></head>
+    <body><h1>Hello</h1><g:layoutBody /></body>
+</html>
+'''
+        def result = applyLayout(layout, template)
+
+        assertEquals '''
+<html>
+    <head><title>Decorated Base - Dialog - This is the title</title><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"></head>
+    <body><h1>Hello</h1><div id="base"><div id="dialog">body text</div></div></body>
+</html>
+''', result
+    }
+
     void testParameters() {
         def template = '''
 <html>

diff --git a/...t-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/taglib/FormTagLib3Tests.groovy b/...t-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/taglib/FormTagLib3Tests.groovy
@@ -327,6 +327,20 @@ class FormTagLib3Tests extends AbstractGrailsTagTests {
             assertEquals 'Tag [select] is missing required attribute [name]', message
         }
     }
+
+    void testSelectTagWithNullAttribute() {
+        final StringWriter sw = new StringWriter()
+        final PrintWriter pw = new PrintWriter(sw)
+
+        withTag("select", pw) { tag ->
+            assertNotNull tag
+            tag([name: 'mySelectTag', from: [], errors: null])
+        }
+
+        println sw.toString()
+
+        assertTrue sw.toString().startsWith('<select name="mySelectTag" id="mySelectTag" >')
+    }
 
     void testDatePickerWithYearsAndRelativeYearsAttribute() {
         final StringWriter sw = new StringWriter()