diff --git a/grails-plugin-gsp/src/main/groovy/org/codehaus/groovy/grails/plugins/web/taglib/ApplicationTagLib.groovy b/grails-plugin-gsp/src/main/groovy/org/codehaus/groovy/grails/plugins/web/taglib/ApplicationTagLib.groovy index f7b8080d881..67356f33169 100644 --- a/grails-plugin-gsp/src/main/groovy/org/codehaus/groovy/grails/plugins/web/taglib/ApplicationTagLib.groovy +++ b/grails-plugin-gsp/src/main/groovy/org/codehaus/groovy/grails/plugins/web/taglib/ApplicationTagLib.groovy @@ -359,8 +359,6 @@ class ApplicationTagLib implements ApplicationContextAware, InitializingBean, Gr } def params = urlAttrs.params && urlAttrs.params instanceof Map ? urlAttrs.params : [:] if (request.flowExecutionKey) { - params.execution = request.flowExecutionKey - urlAttrs.params = params if (attrs.controller == null && attrs.action == null && attrs.url == null && attrs.uri == null) { urlAttrs[LinkGenerator.ATTRIBUTE_ACTION] = GrailsWebRequest.lookup().actionName } diff --git a/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/taglib/ApplicationTagLibTests.groovy b/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/taglib/ApplicationTagLibTests.groovy index 50f16a80c48..30becd9f210 100644 --- a/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/taglib/ApplicationTagLibTests.groovy +++ b/grails-test-suite-web/src/test/groovy/org/codehaus/groovy/grails/web/taglib/ApplicationTagLibTests.groovy @@ -291,32 +291,27 @@ class ApplicationTagLibTests extends AbstractGrailsTagTests { void testCreateLinkWithFlowExecutionKeyAndEvent() { unRegisterRequestDataValueProcessor() - request.flowExecutionKey = '12345' - + def template = '' - assertOutputEquals('/foo/bar?execution=12345&_eventId=boo', template) + assertOutputEquals('/foo/bar?_eventId=boo', template) } void testCreateLinkWithFlowExecutionKeyAndEventAndRequestDataValueProcessor() { - request.flowExecutionKey = '12345' def template = '' - assertOutputEquals('/foo/bar?execution=12345&_eventId=boo&requestDataValueProcessorParamName=paramValue', template) + assertOutputEquals('/foo/bar?_eventId=boo&requestDataValueProcessorParamName=paramValue', template) } void testLinkWithFlowExecutionKeyAndEvent() { unRegisterRequestDataValueProcessor() - request.flowExecutionKey = '12345' def template = 'link' - assertOutputEquals('link', template) + assertOutputEquals('link', template) } void testLinkWithFlowExecutionKeyAndEventAndRequestDataValueProcessor() { - request.flowExecutionKey = '12345' - def template = 'link' - assertOutputEquals('link', template) + assertOutputEquals('link', template) } void testSetTag() {