diff --git a/core/src/main/java/org/apache/struts2/components/File.java b/core/src/main/java/org/apache/struts2/components/File.java index 09b91a7ad..f93ac7742 100644 --- a/core/src/main/java/org/apache/struts2/components/File.java +++ b/core/src/main/java/org/apache/struts2/components/File.java @@ -99,4 +99,10 @@ public class File extends UIBean { public void setSize(String size) { this.size = size; } + + @Override + @StrutsTagAttribute(description="Ignored during file upload") + public void setValue(String value) { + // ignores provided value + } } diff --git a/core/src/site/resources/tags/file-attributes.html b/core/src/site/resources/tags/file-attributes.html index 5f51badb6..e23f5dca5 100644 --- a/core/src/site/resources/tags/file-attributes.html +++ b/core/src/site/resources/tags/file-attributes.html @@ -371,6 +371,6 @@ false String - Preset the value of input element. + Ignored during file upload diff --git a/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/FileHandler.java b/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/FileHandler.java index 1c0b7275a..1ccdd8efa 100644 --- a/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/FileHandler.java +++ b/plugins/javatemplates/src/main/java/org/apache/struts2/views/java/simple/FileHandler.java @@ -33,7 +33,6 @@ public class FileHandler extends AbstractTagHandler implements TagGenerator { a.addDefaultToEmpty("name", params.get("name")) .add("type", "file") .addIfExists("size", params.get("size")) - .addIfExists("value", params.get("nameValue")) .addIfTrue("disabled", params.get("disabled")) .addIfExists("accept", params.get("accept")) .addIfExists("tabindex", params.get("tabindex")) diff --git a/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/FileTest.java b/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/FileTest.java index 0a455c28a..16ce86b65 100644 --- a/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/FileTest.java +++ b/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/FileTest.java @@ -28,7 +28,6 @@ public class FileTest extends AbstractCommonAttributesTest { public void testRenderTextField() { tag.setName("name"); - tag.setValue("val1"); tag.setSize("10"); tag.setDisabled("true"); tag.setAccept("accept_"); @@ -43,7 +42,7 @@ public class FileTest extends AbstractCommonAttributesTest { map.putAll(tag.getParameters()); theme.renderTag(getTagName(), context); String output = writer.getBuffer().toString(); - String expected = s(""); + String expected = s(""); assertEquals(expected, output); }