Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 15:46:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-5129 Trims internal prefix used to identify second control's Dynamic Attributes

Browse Source
This commit is contained in:
Lukasz Lenart
2021-11-10 08:12:23 +01:00
parent 7403de84a1
commit 57ed5605c9
7 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/resources/template/simple/prefixed-dynamic-attributes.ftl
+1 -1
View File
@@ -29,7 +29,7 @@
<#else>
<#assign value = keyValue?string/>
</#if>
${aKey}="${value}"<#rt/>
${aKey?keep_after(prefix)}="${value}"<#rt/>
</#if>
</#list><#rt/>
</#if><#rt/>
core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java
+2 -2
View File
@@ -289,8 +289,8 @@ public class DoubleSelectTest extends AbstractUITagTest {
public void testGenericSimpleWithDynamicAttributes() throws Exception {
DoubleSelectTag tag = new DoubleSelectTag();
tag.setDynamicAttribute(null, "first-name", "firstName");
tag.setDynamicAttribute(null, "second-name", "secondName");
tag.setDynamicAttribute(null, "select-name", "firstName");
tag.setDynamicAttribute(null, "second-select-name", "secondName");
prepareTagGeneric(tag);
verifyGenericProperties(tag, "simple", new String[]{"value"});
verify(SelectTag.class.getResource("DoubleSelect-5.txt"));
core/src/test/java/org/apache/struts2/views/jsp/ui/InputTransferSelectTagTest.java
+1 -1
View File
@@ -57,7 +57,7 @@ public class InputTransferSelectTagTest extends AbstractUITagTest {
InputTransferSelectTag tag = new InputTransferSelectTag();
tag.setPageContext(pageContext);
tag.setDynamicAttribute(null, "input-name", "inputName");
tag.setDynamicAttribute(null, "input-collection-name", "inputName");
tag.setDynamicAttribute(null, "collection-name", "collectionName");
tag.setName("collection");
core/src/test/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTagTest.java
+2 -2
View File
@@ -548,8 +548,8 @@ public class OptionTransferSelectTagTest extends AbstractUITagTest {
tag.setDoubleName("list2");
tag.setDoubleList("list2");
tag.setDynamicAttribute(null, "left-name", "leftName");
tag.setDynamicAttribute(null, "right-name", "rightName");
tag.setDynamicAttribute(null, "collection", "leftName");
tag.setDynamicAttribute(null, "right-collection", "rightName");
tag.doStartTag();
tag.doEndTag();
core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-5.txt
+2 -2
View File
@@ -2,12 +2,12 @@
title="someTitle" onclick="onclick1" ondblclick="ondblclick1" onmousedown="onmousedown1" onmouseup="onmouseup1"
onmouseover="onmouseover1" onmousemove="onmousemove1" onmouseout="onmouseout1" onfocus="onfocus1" onblur="onblur1"
onkeypress="onkeypress1" onkeydown="onkeydown1" onkeyup="onkeyup1" onselect="onchange"
onchange="someIdRedirect(this.selectedIndex)" first-name="firstName">
onchange="someIdRedirect(this.selectedIndex)" select-name="firstName">
<option value="BE">Belgium</option>
<option value="FR" selected="selected">France</option>
</select>
<br />
<select name="region" disabled="disabled" id="region" title="someTitle" second-name="secondName"></select>
<select name="region" disabled="disabled" id="region" title="someTitle" select-name="secondName"></select>
<script type="text/javascript">
var someIdGroup = newArray(2 + 0);
for (var i = 0; i < (2 + 0); i++) {
core/src/test/resources/org/apache/struts2/views/jsp/ui/inputtransferselect-2.txt
+2 -2
View File
@@ -1,10 +1,10 @@
<tr>
<td class="tdLabel"></td>
<td class="tdInput">
<script type="text/javascript" src="/struts/inputtransferselect.js"></script>
<script type="text/javascript" src="/static/inputtransferselect.js"></script>
<table>
<tr>
<td><input type="text" name="collection_input" id="collection_input" input-name="inputName"/></td>
<td><input type="text" name="collection_input" id="collection_input" collection-name="inputName" /></td>
<td class="tdTransferSelect">
<input type="button" value="-&gt;"
onclick="addOption(document.getElementById('collection_input'),document.getElementById('collection'))" />
core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-8.txt
+8 -8
View File
@@ -1,11 +1,11 @@
<tr>
<td class="tdLabel"></td>
<td class="tdInput">
<script type="text/javascript" src="/struts/optiontransferselect.js"></script>
<script type="text/javascript" src="/static/optiontransferselect.js"></script>
<table>
<tr>
<td>
<select name="collection" size="15" id="collection" multiple="multiple" left-name="leftName">
<select name="collection" size="15" id="collection" multiple="multiple" collection="leftName">
<option value="Left1" selected="selected">Left1</option>
<option value="Left2" selected="selected">Left2</option>
</select>
@@ -14,29 +14,29 @@
<input type="button" onclick="moveOptionUp(document.getElementById('collection'),'key',''); " value="^" />
</td>
<td class="tdTransferSelect">
<input type="button" value="<-"
<input type="button" value="&lt;-"
onclick="moveSelectedOptions(document.getElementById('list2'),document.getElementById('collection'),false,'');" />
<br />
<br />
<input type="button" value="->"
<input type="button" value="-&gt;"
onclick="moveSelectedOptions(document.getElementById('collection'),document.getElementById('list2'),false,'');" />
<br />
<br />
<input type="button" value="<<--"
<input type="button" value="&lt;&lt;--"
onclick="moveAllOptions(document.getElementById('list2'),document.getElementById('collection'),false,'');" />
<br />
<br />
<input type="button" value="-->>"
<input type="button" value="--&gt;&gt;"
onclick="moveAllOptions(document.getElementById('collection'),document.getElementById('list2'),false,'');" />
<br />
<br />
<input type="button" value="<*>"
<input type="button" value="&lt;*&gt;"
onclick="selectAllOptions(document.getElementById('collection'));selectAllOptions(document.getElementById('list2'));" />
<br />
<br />
</td>
<td>
<select name="list2" size="15" multiple="multiple" id="list2" right-name="rightName">
<select name="list2" size="15" multiple="multiple" id="list2" collection="rightName">
<option value="Right1" selected="selected">Right1</option>
<option value="Right2" selected="selected">Right2</option>
</select>