From e3ca240b7059c50b762fee490d7d53e6804452be Mon Sep 17 00:00:00 2001 From: Greg Huber Date: Wed, 14 Feb 2024 10:50:50 +0000 Subject: [PATCH 1/4] s:file shows server/file location WW-5396 --- .../java/org/apache/struts2/views/java/simple/FileHandler.java | 1 - 1 file changed, 1 deletion(-) 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")) From de9aacef61e280bed62a74008e060ae5a24005ab Mon Sep 17 00:00:00 2001 From: Greg Huber Date: Wed, 14 Feb 2024 11:04:43 +0000 Subject: [PATCH 2/4] s:file shows server/file location WW-5396 --- .../java/org/apache/struts2/views/java/simple/FileTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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); } From 1c59b45a23e843238be74fdefb77e5368dc137c1 Mon Sep 17 00:00:00 2001 From: Greg Huber Date: Wed, 14 Feb 2024 11:52:38 +0000 Subject: [PATCH 3/4] s:file shows server/file location WW-5396 --- core/src/main/java/org/apache/struts2/components/File.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 + } } From bb3edaec0630b19d7dcc10026113fe3183f57938 Mon Sep 17 00:00:00 2001 From: Greg Huber Date: Wed, 14 Feb 2024 12:00:53 +0000 Subject: [PATCH 4/4] s:file shows server/file location WW-5396 --- core/src/site/resources/tags/file-attributes.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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