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

IDEMPIERE-2144 Pack in of Attachment: Update entry is using wrong index.

This commit is contained in:
Heng Sin Low 2014-08-13 15:06:08 +08:00
parent 1b75bb4e78
commit 6758daac61
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
org.adempiere.base/src/org/compiere/model/MAttachment.java
View File

@ -303,6 +303,7 @@ public class MAttachment extends X_AD_Attachment
} }
if (!replaced) { if (!replaced) {
retValue = m_items.add(item); retValue = m_items.add(item);
item.setIndex(m_items.size());
} }
if (log.isLoggable(Level.FINE)) log.fine(item.toStringX()); if (log.isLoggable(Level.FINE)) log.fine(item.toStringX());
setBinaryData(new byte[0]); // ATTENTION! HEAVY HACK HERE... Else it will not save :( setBinaryData(new byte[0]); // ATTENTION! HEAVY HACK HERE... Else it will not save :(

4
org.adempiere.base/src/org/compiere/model/MAttachmentEntry.java
View File

@ -296,4 +296,8 @@ public class MAttachmentEntry
return new ByteArrayInputStream(m_data); return new ByteArrayInputStream(m_data);
} // getInputStream } // getInputStream
public void setIndex(int index) {
m_index = index;
}
} // MAttachmentItem } // MAttachmentItem

7
org.adempiere.pipo/src/org/adempiere/pipo2/PoFiller.java
View File

@ -304,15 +304,20 @@ public class PoFiller{
MAttachment attach = ((MAttachment)po); MAttachment attach = ((MAttachment)po);
for (File file : files) { for (File file : files) {
boolean found = false; boolean found = false;
int index = -1;
for (MAttachmentEntry entry : attach.getEntries()) { for (MAttachmentEntry entry : attach.getEntries()) {
index++;
if (entry.getName().equals(file.getName())) { if (entry.getName().equals(file.getName())) {
found = true; found = true;
attach.updateEntry(entry.getIndex(), file); attach.updateEntry(index, file);
break;
} }
} }
if (! found) if (! found)
attach.addEntry(file); attach.addEntry(file);
} }
if (!attach.is_Changed())
attach.set_ValueNoCheck("Updated", new Timestamp(System.currentTimeMillis()));
} }
} else { } else {
Object data = null; Object data = null;