midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-2961 Allow multi-upload in attachment window

This commit is contained in:
Carlos Ruiz 2015-12-06 18:58:00 -05:00
parent c47d87d389
commit d34c68f3a0
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java
View File

@ -269,8 +269,7 @@ public class WAttachment extends Window implements EventListener<Event>
bLoad.setId("bLoad"); bLoad.setId("bLoad");
// bLoad.setAttribute("org.zkoss.zul.image.preload", Boolean.TRUE); // bLoad.setAttribute("org.zkoss.zul.image.preload", Boolean.TRUE);
bLoad.setTooltiptext(Msg.getMsg(Env.getCtx(), "Load")); bLoad.setTooltiptext(Msg.getMsg(Env.getCtx(), "Load"));
// bLoad.setUpload(AdempiereWebUI.getUploadSetting()); bLoad.setUpload("multiple=true," + AdempiereWebUI.getUploadSetting());
bLoad.setUpload("true,accept=audio/*|video/*|image/*|MIME_type,native");
bLoad.addEventListener(Events.ON_UPLOAD, this); bLoad.addEventListener(Events.ON_UPLOAD, this);
bDelete.addEventListener(Events.ON_CLICK, this); bDelete.addEventListener(Events.ON_CLICK, this);
@ -386,6 +385,7 @@ public class WAttachment extends Window implements EventListener<Event>
} }
else else
{ {
clearPreview();
return false; return false;
} }
} }
@ -478,7 +478,11 @@ public class WAttachment extends Window implements EventListener<Event>
if (e instanceof UploadEvent) { if (e instanceof UploadEvent) {
preview.setVisible(false); preview.setVisible(false);
UploadEvent ue = (UploadEvent) e; UploadEvent ue = (UploadEvent) e;
processUploadMedia(ue.getMedia()); for (Media media : ue.getMedias()) {
processUploadMedia(media);
}
clearPreview();
autoPreview (cbContent.getSelectedIndex(), false);
} else if (e.getTarget() == bOk || DialogEvents.ON_WINDOW_CLOSE.equals(e.getName())) { } else if (e.getTarget() == bOk || DialogEvents.ON_WINDOW_CLOSE.equals(e.getName())) {
if (m_attachment != null) { if (m_attachment != null) {
String newText = text.getText(); String newText = text.getText();
@ -552,8 +556,6 @@ public class WAttachment extends Window implements EventListener<Event>
{ {
m_attachment.updateEntry(i, getMediaData(media)); m_attachment.updateEntry(i, getMediaData(media));
cbContent.setSelectedIndex(i); cbContent.setSelectedIndex(i);
clearPreview();
autoPreview(cbContent.getSelectedIndex(), false);
m_change = true; m_change = true;
return; return;
} }
@ -564,8 +566,6 @@ public class WAttachment extends Window implements EventListener<Event>
{ {
cbContent.appendItem(media.getName(), media.getName()); cbContent.appendItem(media.getName(), media.getName());
cbContent.setSelectedIndex(cbContent.getItemCount()-1); cbContent.setSelectedIndex(cbContent.getItemCount()-1);
autoPreview(cbContent.getSelectedIndex(), false);
clearPreview();
m_change = true; m_change = true;
} }
} }
@ -610,8 +610,10 @@ public class WAttachment extends Window implements EventListener<Event>
{ {
if (result) if (result)
{ {
m_attachment.delete(true); if (m_attachment != null) {
m_attachment = null; m_attachment.delete(true);
m_attachment = null;
}
} }
} }
}); });