GRAILS-11447 add support for namespace attribute in g:form tag

Author: lhotari

grails-plugin-gsp/src/main/groovy/org/codehaus/groovy/grails/plugins/web/taglib/ApplicationTagLib.groovy

@@ -224,8 +224,6 @@ class ApplicationTagLib implements ApplicationContextAware, InitializingBean, Gr
         if (elementId) {
             writer << " id=\"${elementId}\""
         }
-        attrs.remove(UrlMapping.PLUGIN)
-        attrs.remove(UrlMapping.NAMESPACE)
         def remainingKeys = attrs.keySet() - LinkGenerator.LINK_ATTRIBUTES
         for (key in remainingKeys) {
             writer << " " << key << "=\"" << attrs[key]?.encodeAsHTML() << "\""

grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/taglib/FormTagLibTests.groovy

@@ -2,8 +2,10 @@ package org.codehaus.groovy.grails.web.taglib
 
 import grails.util.MockRequestDataValueProcessor
 
+import org.codehaus.groovy.grails.commons.AbstractGrailsClass
+import org.codehaus.groovy.grails.commons.GrailsUrlMappingsClass
+import org.codehaus.groovy.grails.commons.UrlMappingsArtefactHandler
 import org.codehaus.groovy.grails.plugins.web.taglib.FormTagLib
-import org.codehaus.groovy.grails.support.MockApplicationContext
 
 /**
  * Tests for the FormTagLib.groovy file which contains tags to help with the                                         l
@@ -18,6 +20,42 @@ class FormTagLibTests extends AbstractGrailsTagTests {
         super.setUp()
         appCtx.getBean(FormTagLib.name).requestDataValueProcessor = new MockRequestDataValueProcessor()
     }
+    
+    @Override
+    protected void onInit() {
+        def mappingsClosure = {
+            "/admin/books"(controller:'books', namespace:'admin')
+            "/books"(controller:'books')
+        }
+        grailsApplication.addArtefact(UrlMappingsArtefactHandler.TYPE, new MockGrailsUrlMappingsClass(mappingsClosure));
+    }
+    
+    void testFormNamespace() {
+        def template = '<g:form controller="books" namespace="admin"></g:form>'
+        assertOutputEquals('<form action="/admin/books" method="post" ><input type="hidden" name="requestDataValueProcessorHiddenName" value="hiddenValue" />\n</form>', template)
+    }
+    
+    void testFormNoNamespace() {
+        def template = '<g:form controller="books"></g:form>'
+        assertOutputEquals('<form action="/books" method="post" ><input type="hidden" name="requestDataValueProcessorHiddenName" value="hiddenValue" />\n</form>', template)
+    }
+    
+    private static final class MockGrailsUrlMappingsClass extends AbstractGrailsClass implements GrailsUrlMappingsClass {
+        Closure mappingClosure;
+        public MockGrailsUrlMappingsClass(Closure mappingClosure) {
+            super(this.getClass(), "UrlMappings");
+            this.mappingClosure = mappingClosure;
+        }
+        @Override
+        public Closure getMappingsClosure() {
+            return mappingClosure;
+        }
+        
+        @Override
+        public List getExcludePatterns() {
+            return null;
+        }
+    }
 
     void testFormTagWithAlternativeMethod() {
         unRegisterRequestDataValueProcessor()

grails-web/src/main/groovy/org/codehaus/groovy/grails/web/mapping/LinkGenerator.java

@@ -44,6 +44,9 @@ public interface LinkGenerator {
     String ATTRIBUTE_MAPPING = "mapping";
     String ATTRIBUTE_EVENT = "event";
     String ATTRIBUTE_ELEMENT_ID = "elementId";
+    String ATTRIBUTE_PLUGIN = "plugin";
+    String ATTRIBUTE_NAMESPACE = "namespace";
+    
 
     Set<String> LINK_ATTRIBUTES = CollectionUtils.newSet(
        ATTRIBUTE_RESOURCE,
@@ -61,7 +64,10 @@ public interface LinkGenerator {
        ATTRIBUTE_PARAMS,
        ATTRIBUTE_MAPPING,
        ATTRIBUTE_EVENT,
-       ATTRIBUTE_ELEMENT_ID);
+       ATTRIBUTE_ELEMENT_ID,
+       ATTRIBUTE_PLUGIN,
+       ATTRIBUTE_NAMESPACE
+       );
 
     /**
      * Generates a link to a static resource for the given named parameters.