Skip to content

Commit d66f7e2

Browse files
committed
Use parameter map from sectioninfo
1 parent 9d7dc3c commit d66f7e2

File tree

8 files changed

+40
-3
lines changed

8 files changed

+40
-3
lines changed

.editorconfig

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ trim_trailing_whitespace = true
1010

1111
[*.java]
1212
indent_style = tab
13-
tab_width = 4
13+
indent_size = 4
14+
tab_width = 4

Platform/Plugins/com.tle.web.sections/src/com/tle/web/sections/SectionInfo.java

+2
Original file line numberDiff line numberDiff line change
@@ -400,4 +400,6 @@ public interface SectionInfo extends InfoCreator
400400
boolean isErrored();
401401

402402
void setErrored();
403+
404+
Map<String, String[]> getParameterMap();
403405
}

Platform/Plugins/com.tle.web.sections/src/com/tle/web/sections/SectionWriter.java

+6
Original file line numberDiff line numberDiff line change
@@ -640,4 +640,10 @@ public void setErrored()
640640
{
641641
renderContext.setErrored();
642642
}
643+
644+
@Override
645+
public Map<String, String[]> getParameterMap()
646+
{
647+
return renderContext.getParameterMap();
648+
}
643649
}

Platform/Plugins/com.tle.web.sections/src/com/tle/web/sections/events/ParametersEvent.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,12 @@ public boolean hasParameter(String param)
5757
return false;
5858
}
5959

60-
public String getParameter(String param, boolean mandatory) throws BadRequestException
60+
public Map<String, String[]> getParameterMap()
61+
{
62+
return parameters;
63+
}
64+
65+
public String getParameter(String param, boolean mandatory) throws BadRequestException
6166
{
6267
String[] params = parameters.get(param);
6368
if( params != null && params.length > 0 )

Platform/Plugins/com.tle.web.sections/src/com/tle/web/sections/events/StandardRenderEventContext.java

+6
Original file line numberDiff line numberDiff line change
@@ -491,4 +491,10 @@ public void setErrored()
491491
{
492492
renderContext.setErrored();
493493
}
494+
495+
@Override
496+
public Map<String, String[]> getParameterMap()
497+
{
498+
return renderContext.getParameterMap();
499+
}
494500
}

Platform/Plugins/com.tle.web.sections/src/com/tle/web/sections/generic/DefaultSectionInfo.java

+11
Original file line numberDiff line numberDiff line change
@@ -877,4 +877,15 @@ public void setErrored()
877877
{
878878
errored = true;
879879
}
880+
881+
@Override
882+
public Map<String, String[]> getParameterMap()
883+
{
884+
Map<String, String[]> paramMap = new HashMap<>();
885+
for( ParametersEvent paramEvent : parametersEvents )
886+
{
887+
paramMap.putAll(paramEvent.getParameterMap());
888+
}
889+
return paramMap;
890+
}
880891
}

Platform/Plugins/com.tle.web.sections/src/com/tle/web/sections/generic/WrappedSectionInfo.java

+6
Original file line numberDiff line numberDiff line change
@@ -334,4 +334,10 @@ public void setErrored()
334334
{
335335
info.setErrored();
336336
}
337+
338+
@Override
339+
public Map<String, String[]> getParameterMap()
340+
{
341+
return info.getParameterMap();
342+
}
337343
}

Source/Plugins/Core/com.equella.core/src/com/tle/web/controls/advancedscript/AdvancedScriptWebControl.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ private ScriptContext getScriptContext(SectionInfo info, boolean request, boolea
293293
if( request )
294294
{
295295
Map<Object, Object> paramMap = new HashMap<>();
296-
paramMap.putAll(info.getRequest().getParameterMap());
296+
paramMap.putAll(info.getParameterMap());
297297
String submitter = info.getAttribute(SUBMITTER_NAME_KEY);
298298
if( !Check.isEmpty(submitter) )
299299
{

0 commit comments

Comments
 (0)