Upload limit to PDF and 10MB

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 5d54d109b454f93669365b214695052d0f22dd9b..3b78075c1d70feecc62abc78c80de61b22f4317f 100644 (file)
--- 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 e332e56e15edc9f0b192f1ddb1c7fbe2cb7da617..dd730c81664090024e87b06cfb0c68777aa74018 100644 (file)
--- a/lis-ui/src/main/resources/metainfo/zk/zk.xml
+++ b/lis-ui/src/main/resources/metainfo/zk/zk.xml
@@ -3,6 +3,7 @@
     <config-name/>
     <system-config>
         <ui-factory-class>org.zkoss.zk.ui.http.SerializableUiFactory</ui-factory-class>
+        <max-upload-size>10240</max-upload-size>
     </system-config>
     <library-property>
         <name>org.zkoss.theme.preferred</name>

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 7a66daafd0f8f8e3388eaadc476c0cb50ea23431..9457614887d7958150f2e81d25f94cc977c033bb 100644 (file)
--- 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());
     </zscript>
     <window id="invoicePopup" title="Bejövő számla szerkesztés" width="50%" height="50%" closable="true"
-            viewModel="@id('vm') @init('hu.user.lis.ui.view.InvoiceEditorModel')">
+            maximizable="true" sizable="true" viewModel="@id('vm') @init('hu.user.lis.ui.view.InvoiceEditorModel')">
         <borderlayout>
             <center border="none" vflex="true" hflex="true">
                 <tabbox vflex="true" hflex="true">
@@ -88,7 +88,7 @@
                                 <north flex="true">
                                     <toolbar>
                                         <toolbarbutton label="Feltöltés" iconSclass="z-icon-plus" upload="true"
-                                                       onUpload="@command('onUploadFile', evt=event)"/>
+                                                       onUpload="@command('onUploadFile')"/>
                                         <toolbarbutton label="Törlés" iconSclass="z-icon-remove"
                                                        onClick="@command('onRemoveFile')"
                                                        disabled="@load(empty vm.formDocument.file)"/>

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 6a4b4dc765344f67c5e5c44be2d62d7654f34b64..6643ee0680075c0889d6defe1496758904f1deb0 100644 (file)
--- 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());
     </zscript>
     <window id="invoicePopup" title="Kimenő számla szerkesztés" width="50%" height="50%" closable="true"
-            viewModel="@id('vm') @init('hu.user.lis.ui.view.InvoiceEditorModel')">
+            maximizable="true" sizable="true" viewModel="@id('vm') @init('hu.user.lis.ui.view.InvoiceEditorModel')">
         <borderlayout>
             <center border="none" vflex="true" hflex="true">
                 <tabbox vflex="true" hflex="true">
@@ -80,7 +80,7 @@
                                 <north flex="true">
                                     <toolbar>
                                         <toolbarbutton label="Feltöltés" iconSclass="z-icon-plus" upload="true"
-                                                       onUpload="@command('onUploadFile', evt=event)"/>
+                                                       onUpload="@command('onUploadFile')"/>
                                         <toolbarbutton label="Törlés" iconSclass="z-icon-remove"
                                                        onClick="@command('onRemoveFile')"
                                                        disabled="@load(empty vm.formDocument.file)"/>