From 4b7f6336a4366faba8b0336207c5dc49c8955581 Mon Sep 17 00:00:00 2001 From: elgekko Date: Mon, 24 Apr 2023 20:57:16 +0200 Subject: [PATCH] Upload limit to PDF and 10MB --- .../main/java/hu/user/lis/ui/view/InvoiceEditorModel.java | 5 +++++ lis-ui/src/main/resources/metainfo/zk/zk.xml | 1 + lis-ui/src/main/resources/web/incoming-invoice-editor.zul | 4 ++-- lis-ui/src/main/resources/web/outgoing-invoice-editor.zul | 4 ++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lis-ui/src/main/java/hu/user/lis/ui/view/InvoiceEditorModel.java b/lis-ui/src/main/java/hu/user/lis/ui/view/InvoiceEditorModel.java index 5d54d10..3b78075 100644 --- a/lis-ui/src/main/java/hu/user/lis/ui/view/InvoiceEditorModel.java +++ b/lis-ui/src/main/java/hu/user/lis/ui/view/InvoiceEditorModel.java @@ -19,6 +19,7 @@ import org.zkoss.zk.ui.event.*; import org.zkoss.zk.ui.select.annotation.VariableResolver; import org.zkoss.zk.ui.select.annotation.WireVariable; import org.zkoss.zkplus.spring.DelegatingVariableResolver; +import org.zkoss.zul.Messagebox; import org.zkoss.zul.Window; import java.util.Objects; @@ -124,6 +125,10 @@ public class InvoiceEditorModel extends AbstractValidator { @Command public void onUploadFile(@ContextParam(ContextType.BIND_CONTEXT) BindContext ctx) { UploadEvent evt = (UploadEvent) ctx.getTriggerEvent(); + if (!evt.getMedia().getName().toLowerCase().endsWith(".pdf")) { + Messagebox.show("Csak PDF állomány feltöltése támogatott.", "Error", Messagebox.OK, Messagebox.ERROR); + return; + } formDocument.setFile(evt.getMedia().getByteData()); BindUtils.postNotifyChange(this.formDocument, "file"); validate(invoiceServiceImpl.copy(formDocument)); diff --git a/lis-ui/src/main/resources/metainfo/zk/zk.xml b/lis-ui/src/main/resources/metainfo/zk/zk.xml index e332e56..dd730c8 100644 --- a/lis-ui/src/main/resources/metainfo/zk/zk.xml +++ b/lis-ui/src/main/resources/metainfo/zk/zk.xml @@ -3,6 +3,7 @@ org.zkoss.zk.ui.http.SerializableUiFactory + 10240 org.zkoss.theme.preferred diff --git a/lis-ui/src/main/resources/web/incoming-invoice-editor.zul b/lis-ui/src/main/resources/web/incoming-invoice-editor.zul index 7a66daa..9457614 100644 --- a/lis-ui/src/main/resources/web/incoming-invoice-editor.zul +++ b/lis-ui/src/main/resources/web/incoming-invoice-editor.zul @@ -7,7 +7,7 @@ ListModelList currencies = new ListModelList(Currency.values()); + maximizable="true" sizable="true" viewModel="@id('vm') @init('hu.user.lis.ui.view.InvoiceEditorModel')">
@@ -88,7 +88,7 @@ + onUpload="@command('onUploadFile')"/> diff --git a/lis-ui/src/main/resources/web/outgoing-invoice-editor.zul b/lis-ui/src/main/resources/web/outgoing-invoice-editor.zul index 6a4b4dc..6643ee0 100644 --- a/lis-ui/src/main/resources/web/outgoing-invoice-editor.zul +++ b/lis-ui/src/main/resources/web/outgoing-invoice-editor.zul @@ -7,7 +7,7 @@ ListModelList currencies = new ListModelList(Currency.values()); + maximizable="true" sizable="true" viewModel="@id('vm') @init('hu.user.lis.ui.view.InvoiceEditorModel')">
@@ -80,7 +80,7 @@ + onUpload="@command('onUploadFile')"/> -- 2.54.0