Skip to content

[WICKET-7035] fileCountMax is added #561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
solomax wants to merge 11 commits into from
Closed

[WICKET-7035] fileCountMax is added #561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
30c575e
fileCountMax is added
solomax Mar 20, 2023
e8c3ecd
All required files files seems to be updated, comments are addressed
solomax Mar 22, 2023
1f1912e
More work on max file count
solomax Mar 22, 2023
8ea72af
Code to automatically set fileCountMax is added
solomax Mar 23, 2023
6c3f5a0
Optional is inited
solomax Mar 23, 2023
9f0a296
Tests should be fixed
solomax Mar 23, 2023
9744f9a
Processing of FileUploadField is added
solomax Mar 23, 2023
8c08911
Revert "Processing of FileUploadField is added"
solomax Mar 23, 2023
f0d296b
Revert "Tests should be fixed"
solomax Mar 23, 2023
6be7a45
Revert "Optional is inited"
solomax Mar 23, 2023
5b3974a
Revert "Code to automatically set fileCountMax is added"
solomax Mar 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions wicket-core/src/main/java/org/apache/wicket/Application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ MinimumValidator=The value of '${label}' must be at least ${minimum}.
#deprecated, use RangeValidator.maximum
MaximumValidator=The value of '${label}' must be at most ${maximum}.

#raplaced with RangeValidator
#raplaced with RangeValidator
NumberValidator.positive=The value of '${label}' must be a positive number.
#replaced with RangeValidator
NumberValidator.negative=The value of '${label}' must be a negative number.
Expand Down Expand Up @@ -57,11 +57,12 @@ PagingNavigator.last=Go to last page
PagingNavigation.page=Go to page ${page}

org.apache.wicket.mfu.caption.unlimited=Files:
org.apache.wicket.mfu.caption.limited=Files (maximum ${max}):
org.apache.wicket.mfu.caption.limited=Files (maximum ${max}):
org.apache.wicket.mfu.delete=Delete

uploadTooLarge = File must be less than ${maxSize}.
uploadSingleFileTooLarge = Each of files must be less than ${fileMaxSize}.
uploadTooManyFiles = There should be no more than ${fileCountMax} files.
uploadFailed = File failed to upload: ${exception.localizedMessage}

FeedbackMessage.CSS.undefined=feedbackPanelUNDEFINED
Expand Down
8 changes: 5 additions & 3 deletions wicket-core/src/main/java/org/apache/wicket/Application_ru.properties.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,18 @@

<entry key="null">Выберите значение</entry>
<entry key="nullValid"></entry>

<entry key="PagingNavigator.first">Перейти на первую страницу</entry>
<entry key="PagingNavigator.previous">Перейти на предыдущую страницу</entry>
<entry key="PagingNavigator.next">Перейти на следующую страницу</entry>
<entry key="PagingNavigator.last">Перейти на последнюю страницу</entry>
<entry key="PagingNavigation.page">Перейти на страницу ${page}</entry>

<entry key="org.apache.wicket.mfu.caption.unlimited">Файлы:</entry>
<entry key="org.apache.wicket.mfu.caption.limited">Файлы (всего не больше ${max}): </entry>

<entry key="uploadTooLarge">Размер файла не должен превышать ${maxSize}.</entry>
<entry key="uploadTooManyFiles">Количество загружаемых файлов не должно превышать ${fileCountMax}.</entry>

<entry key="uploadFailed">Ошибка загрузки файла на сервер: ${exception.localizedMessage}.</entry>
</properties>
Loading