Skip to content

Commit

Permalink
WW-5022 Cleans up escapeHtmlBody flag with default value
Browse files Browse the repository at this point in the history
  • Loading branch information
@lukaszlenart
lukaszlenart committed Jan 23, 2022
1 parent effe687 commit 61e6d34
Show file tree
Hide file tree
Showing 15 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@

<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li><s:a value="%{home}" escapeHtmlBody="false"><i class="glyphicon glyphicon-home"></i> Home</s:a></li>
<li><s:a value="%{home}"><i class="glyphicon glyphicon-home"></i> Home</s:a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<i class="glyphicon glyphicon-cog"></i> Configuration
Expand Down Expand Up @@ -239,7 +239,7 @@
</li>
<li><s:a value="/person/index.html">Person Manager</s:a></li>
<li><s:a value="/skill/index.html">CRUD</s:a></li>
<li><s:a value="/wait/index.html" escapeHtmlBody="false">Execute &amp; Wait</s:a></li>
<li><s:a value="/wait/index.html">Execute &amp; Wait</s:a></li>
<li><s:a value="/token/index.html">Token</s:a></li>
<li><s:url var="url" namespace="/modelDriven" action="modelDriven"/><s:a
href="%{url}">Model Driven</s:a></li>
Expand Down
4 changes: 2 additions & 2 deletions apps/showcase/src/main/webapp/WEB-INF/filedownload/index.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@
</div>

<s:url var="url" action="download"/>
<s:a href="%{url}" cssClass="btn btn-large btn-info" escapeHtmlBody="false"><i class="icon-picture"></i> Download image file.</s:a>
<s:a href="%{url}" cssClass="btn btn-large btn-info"><i class="icon-picture"></i> Download image file.</s:a>
</div>
<div class="col-md-6" style="text-align: center;">
<div class="alert alert-info">
The browser should prompt for a location to save the ZIP file.
</div>

<s:url var="url" action="download2"/>
<s:a href="%{url}" cssClass="btn btn-large btn-info" escapeHtmlBody="false"><i class="icon-download-alt"></i> Download ZIP file.</s:a>
<s:a href="%{url}" cssClass="btn btn-large btn-info"><i class="icon-download-alt"></i> Download ZIP file.</s:a>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions apps/showcase/src/main/webapp/WEB-INF/hangman/hangmanNonAjax.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
<#else>
<img src="<@s.property value="%{#looseImageUrl}" />" width="381" height="44" />
</#if>
<@s.a href="%{#startHref}" escapeHtmlBody="false">
<@s.a href="%{#startHref}">
<img src="<@s.property value="%{#startImageUrl}" />" width="250" height="43" />
</@s.a>
<#else>
Expand All @@ -139,7 +139,7 @@

<@s.a href="%{#url}"
id="%{#currentCharacter}"
escapeHtmlBody="false"

>
<img height="36" alt="" src="<@s.property value="%{#chalkboardImageUrl}" />" width="36" border="0" />
</@s.a>
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/webapp/WEB-INF/person/new-person.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
</div>
</div>
<div class="form-actions">
<@s.submit value="Create person" cssClass="btn btn-primary" escapeHtmlBody="false"/>
<@s.submit value="Create person" cssClass="btn btn-primary"/>
</div>
</@s.form>
</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefix.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

<p>The text you've entered is ${text!''}<p/>

<@s.a href="javascript:history.back();" cssClass="btn btn-info" escapeHtmlBody="false"><i class="icon icon-arrow-left"></i> Back</@s.a>
<@s.a href="javascript:history.back();" cssClass="btn btn-info"><i class="icon icon-arrow-left"></i> Back</@s.a>
</div>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/actionPrefixExample.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@

<@s.textfield label="Enter Some Text" name="text" />

<@s.submit action="actionPrefix" value="%{'action prefix'}" cssClass="btn" escapeHtmlBody="false" />
<@s.submit action="actionPrefix" value="%{'action prefix'}" cssClass="btn" />

<@s.submit method="alternateMethod" value="%{'method prefix'}" cssClass="btn" escapeHtmlBody="false" />
<@s.submit method="alternateMethod" value="%{'method prefix'}" cssClass="btn" />

<@s.submit value="Normal Submit" cssClass="btn" escapeHtmlBody="false" />
<@s.submit value="Normal Submit" cssClass="btn" />

<@s.submit action="redirectActionPrefixAction" value="%{'redirectAction without prefix'}" cssClass="btn" escapeHtmlBody="false" />
<@s.submit action="redirectActionPrefixAction" value="%{'redirectAction without prefix'}" cssClass="btn" />

</@s.form>
</div>
Expand Down
4 changes: 2 additions & 2 deletions apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/methodPrefix.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
<div class="col-md-12">

<p>You have come to this page because you used an <strong>method</strong> prefix.<p/>

<p>The text you've enter is ${text!''}<p/>

<@s.a href="javascript:history.back();" cssClass="btn btn-info" escapeHtmlBody="false"><i class="icon icon-arrow-left"></i> Back</@s.a>
<@s.a href="javascript:history.back();" cssClass="btn btn-info"><i class="icon icon-arrow-left"></i> Back</@s.a>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/normalSubmit.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
<div class="col-md-12">

<p>You have come to this page because you did a normal submit.<p/>

<p>The text you've enter is %{text}<p/>

<@s.a href="javascript:history.back();" cssClass="btn btn-info" escapeHtmlBody="false"><i class="icon icon-arrow-left"></i> Back</@s.a>
<@s.a href="javascript:history.back();" cssClass="btn btn-info"><i class="icon icon-arrow-left"></i> Back</@s.a>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/actionPrefix/redirectActionPrefix.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
<div class="col-md-12">

<p>You have come to this page because you used an 'redirect-action' prefix.<p/>

<p>Because this is a <strong>redirect-action</strong>, the text will be lost, due to a redirection
implies a new request being issued from the client.<p/>

The text you've enter is ${text!''}<p/>

<@s.a href="javascript:history.back();" cssClass="btn btn-info" escapeHtmlBody="false"><i class="icon icon-arrow-left"></i> Back</@s.a>
<@s.a href="javascript:history.back();" cssClass="btn btn-info"><i class="icon icon-arrow-left"></i> Back</@s.a>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion .../showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/appendIteratorTagDemoResult.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
</s:iterator>

<s:url var="url" action="showAppendTagDemo" namespace="/tags/non-ui/appendIteratorTag" />
<s:a href="%{#url}" cssClass="btn btn-info" escapeHtmlBody="false"><i class="icon icon-arrow-left"></i> Back To Input</s:a>
<s:a href="%{#url}" cssClass="btn btn-info"><i class="icon icon-arrow-left"></i> Back To Input</s:a>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ...owcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/iteratorGeneratorTagDemoResult.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@


<s:url var="url" action="showGeneratorTagDemo" namespace="/tags/non-ui/iteratorGeneratorTag" />
<s:a href="%{#url}" cssClass="btn btn-info" escapeHtmlBody="false"><i class="icon icon-arrow-left"></i> Back To Input</s:a>
<s:a href="%{#url}" cssClass="btn btn-info"><i class="icon icon-arrow-left"></i> Back To Input</s:a>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/mergeIteratorTagDemoResult.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
</s:iterator>

<s:url var="url" action="showMergeTagDemo" namespace="/tags/non-ui/mergeIteratorTag" />
<s:a href="%{#url}" cssClass="btn btn-info" escapeHtmlBody="false"><i class="icon icon-arrow-left"></i> Back To Input</s:a>
<s:a href="%{#url}" cssClass="btn btn-info"><i class="icon icon-arrow-left"></i> Back To Input</s:a>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion .../showcase/src/main/webapp/WEB-INF/tags/non-ui/iteratorTag/subsetIteratorTagDemoResult.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</s:subset>

<s:url var="url" action="showSubsetTagDemo" namespace="/tags/non-ui/subsetIteratorTag" />
<s:a href="%{#url}" cssClass="btn btn-info" escapeHtmlBody="false"><i class="icon icon-arrow-left"></i> Back To Input</s:a>
<s:a href="%{#url}" cssClass="btn btn-info"><i class="icon icon-arrow-left"></i> Back To Input</s:a>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion apps/showcase/src/main/webapp/WEB-INF/token/example4.ftl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<@s.form action="transfer4">
<@s.token/>
<@s.textfield label="Amount" name="amount" required=true value="400"/>
<@s.submit value="Transfer money" cssClass="btn btn-primary" escapeHtmlBody="false"/>
<@s.submit value="Transfer money" cssClass="btn btn-primary"/>
</@s.form>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/struts2/components/Submit.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public void evaluateParams() {
value = "Submit";
}

if (((key != null)) && (value == null)) {
if ((key != null) && (value == null)) {
this.value = "%{getText('"+key +"')}";
}

Expand Down

0 comments on commit 61e6d34

Please sign in to comment.