Skip to content

Commit 97be2d9

Browse files
committed
Merge pull request #579 from vinod2800/2.4.x
Resolution of GRAILS-11583 - removing of web flow param settings
2 parents 167c4a3 + 5328b20 commit 97be2d9

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,8 +359,6 @@ class ApplicationTagLib implements ApplicationContextAware, InitializingBean, Gr
359359
}
360360
def params = urlAttrs.params && urlAttrs.params instanceof Map ? urlAttrs.params : [:]
361361
if (request.flowExecutionKey) {
362-
params.execution = request.flowExecutionKey
363-
urlAttrs.params = params
364362
if (attrs.controller == null && attrs.action == null && attrs.url == null && attrs.uri == null) {
365363
urlAttrs[LinkGenerator.ATTRIBUTE_ACTION] = GrailsWebRequest.lookup().actionName
366364
}

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -291,32 +291,27 @@ class ApplicationTagLibTests extends AbstractGrailsTagTests {
291291

292292
void testCreateLinkWithFlowExecutionKeyAndEvent() {
293293
unRegisterRequestDataValueProcessor()
294-
request.flowExecutionKey = '12345'
295-
294+
296295
def template = '<g:createLink controller="foo" action="bar" event="boo" />'
297-
assertOutputEquals('/foo/bar?execution=12345&_eventId=boo', template)
296+
assertOutputEquals('/foo/bar?_eventId=boo', template)
298297
}
299298

300299
void testCreateLinkWithFlowExecutionKeyAndEventAndRequestDataValueProcessor() {
301-
request.flowExecutionKey = '12345'
302300

303301
def template = '<g:createLink controller="foo" action="bar" event="boo" />'
304-
assertOutputEquals('/foo/bar?execution=12345&_eventId=boo&requestDataValueProcessorParamName=paramValue', template)
302+
assertOutputEquals('/foo/bar?_eventId=boo&requestDataValueProcessorParamName=paramValue', template)
305303
}
306304

307305
void testLinkWithFlowExecutionKeyAndEvent() {
308306
unRegisterRequestDataValueProcessor()
309-
request.flowExecutionKey = '12345'
310307

311308
def template = '<g:link controller="foo" action="bar" event="boo" >link</g:link>'
312-
assertOutputEquals('<a href="/foo/bar?execution=12345&amp;_eventId=boo">link</a>', template)
309+
assertOutputEquals('<a href="/foo/bar?_eventId=boo">link</a>', template)
313310
}
314311

315312
void testLinkWithFlowExecutionKeyAndEventAndRequestDataValueProcessor() {
316-
request.flowExecutionKey = '12345'
317-
318313
def template = '<g:link controller="foo" action="bar" event="boo" >link</g:link>'
319-
assertOutputEquals('<a href="/foo/bar?execution=12345&amp;_eventId=boo&amp;requestDataValueProcessorParamName=paramValue">link</a>', template)
314+
assertOutputEquals('<a href="/foo/bar?_eventId=boo&amp;requestDataValueProcessorParamName=paramValue">link</a>', template)
320315
}
321316

322317
void testSetTag() {

0 commit comments

Comments
 (0)