You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2016/06/17 07:47:09 UTC

wicket git commit: WICKET-6181 Revert the removal of the default error message when uploading too big files

Repository: wicket
Updated Branches:
  refs/heads/wicket-6.x 1d443afcb -> 46220db46


WICKET-6181 Revert the removal of the default error message when uploading too big files


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/46220db4
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/46220db4
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/46220db4

Branch: refs/heads/wicket-6.x
Commit: 46220db46669affbd03d75c0273208fa474eadcf
Parents: 1d443af
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Jun 16 22:36:10 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Jun 16 22:36:10 2016 +0200

----------------------------------------------------------------------
 .../src/main/java/org/apache/wicket/markup/html/form/Form.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/46220db4/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
index 4c5227b..c7df2ef 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
@@ -1462,8 +1462,9 @@ public class Form<T> extends WebMarkupContainer
 		{
 			// Resource key should be <form-id>.uploadTooLarge to
 			// override default message
+			final String defaultValue = "Upload must be less than " + getMaxSize();
 			String msg = getString(getId() + '.' + UPLOAD_TOO_LARGE_RESOURCE_KEY,
-				Model.ofMap(model));
+				Model.ofMap(model), defaultValue);
 			error(msg);
 		}
 		else if (e instanceof FileUploadBase.FileSizeLimitExceededException)