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

IDEMPIERE-24 Export 2pack zip on BP window fails

This commit is contained in:
David Peñuela 2012-10-31 14:41:19 -05:00
parent 75b4c86421
commit b3de9ec20f
4 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/GenericPOElementHandler.java
View File

@ -311,8 +311,8 @@ public class GenericPOElementHandler extends AbstractElementHandler {
filler.export(excludes, true); filler.export(excludes, true);
} }
} }
if (index + 1 < tables.length) { for (int i=index+1; i<tables.length; i++) {
exportDetail(ctx, document, po, index+1, tables); exportDetail(ctx, document, po, 0, new String[] {tables[i]});
} }
if (createElement) { if (createElement) {
document.endElement("","",tables[index]); document.endElement("","",tables[index]);

26
org.adempiere.pipo/src/org/adempiere/pipo2/AbstractElementHandler.java
View File

@ -62,7 +62,7 @@ public abstract class AbstractElementHandler implements ElementHandler {
* *
*/ */
public int findIdByName (PIPOContext ctx, String tableName, String name) { public int findIdByName (PIPOContext ctx, String tableName, String name) {
return IDFinder.findIdByName(tableName, name, getClientId(ctx.ctx), ctx.trx.getTrxName()); return IDFinder.findIdByName(tableName, name, getClientId(ctx.ctx), getTrxName(ctx));
} }
/** /**
@ -77,13 +77,13 @@ public abstract class AbstractElementHandler implements ElementHandler {
if ("AD_Table".equals(tableName) && "TableName".equals(columnName) && value != null) { if ("AD_Table".equals(tableName) && "TableName".equals(columnName) && value != null) {
id = ctx.packIn.getTableId(value.toString()); id = ctx.packIn.getTableId(value.toString());
if (id <= 0) { if (id <= 0) {
id = IDFinder.findIdByColumn(tableName, columnName, value, getClientId(ctx.ctx), ignorecase, ctx.trx.getTrxName()); id = IDFinder.findIdByColumn(tableName, columnName, value, getClientId(ctx.ctx), ignorecase, getTrxName(ctx));
if (id > 0) { if (id > 0) {
ctx.packIn.addTable(value.toString(), id); ctx.packIn.addTable(value.toString(), id);
} }
} }
} else { } else {
id = IDFinder.findIdByColumn(tableName, columnName, value, getClientId(ctx.ctx), ignorecase, ctx.trx.getTrxName()); id = IDFinder.findIdByColumn(tableName, columnName, value, getClientId(ctx.ctx), ignorecase, getTrxName(ctx));
} }
return id; return id;
} }
@ -99,7 +99,7 @@ public abstract class AbstractElementHandler implements ElementHandler {
* @return X_AD_Package_Imp_Detail * @return X_AD_Package_Imp_Detail
*/ */
public X_AD_Package_Imp_Detail createImportDetail(PIPOContext ctx, String type, String tableName, int tableId) { public X_AD_Package_Imp_Detail createImportDetail(PIPOContext ctx, String type, String tableName, int tableId) {
X_AD_Package_Imp_Detail impDetail = new X_AD_Package_Imp_Detail(ctx.ctx, 0, ctx.trx.getTrxName()); X_AD_Package_Imp_Detail impDetail = new X_AD_Package_Imp_Detail(ctx.ctx, 0, getTrxName(ctx));
impDetail.setAD_Package_Imp_ID(getPackageImpId(ctx.ctx)); impDetail.setAD_Package_Imp_ID(getPackageImpId(ctx.ctx));
impDetail.setAD_Org_ID(Env.getAD_Org_ID(ctx.ctx) ); impDetail.setAD_Org_ID(Env.getAD_Org_ID(ctx.ctx) );
impDetail.setType(type); impDetail.setType(type);
@ -108,7 +108,7 @@ public abstract class AbstractElementHandler implements ElementHandler {
impDetail.setAD_Original_ID(1); impDetail.setAD_Original_ID(1);
impDetail.setTableName(tableName); impDetail.setTableName(tableName);
impDetail.setAD_Table_ID(tableId); impDetail.setAD_Table_ID(tableId);
impDetail.saveEx(ctx.trx.getTrxName()); impDetail.saveEx(getTrxName(ctx));
return impDetail; return impDetail;
} }
@ -145,7 +145,7 @@ public abstract class AbstractElementHandler implements ElementHandler {
* @param nameMaster * @param nameMaster
*/ */
public int findIdByNameAndParentName (PIPOContext ctx, String tableName, String name, String tableNameMaster, String nameMaster) { public int findIdByNameAndParentName (PIPOContext ctx, String tableName, String name, String tableNameMaster, String nameMaster) {
return IDFinder.findIdByNameAndParentName(tableName, name, tableNameMaster, nameMaster, getClientId(ctx.ctx), ctx.trx.getTrxName()); return IDFinder.findIdByNameAndParentName(tableName, name, tableNameMaster, nameMaster, getClientId(ctx.ctx), getTrxName(ctx));
} }
/** /**
@ -159,7 +159,7 @@ public abstract class AbstractElementHandler implements ElementHandler {
public int findIdByColumnAndParentId (PIPOContext ctx, String tableName, String columnName, String name, String tableNameMaster, int masterID) { public int findIdByColumnAndParentId (PIPOContext ctx, String tableName, String columnName, String name, String tableNameMaster, int masterID) {
return IDFinder.findIdByColumnAndParentId(tableName, columnName, name, tableNameMaster, masterID, getClientId(ctx.ctx), return IDFinder.findIdByColumnAndParentId(tableName, columnName, name, tableNameMaster, masterID, getClientId(ctx.ctx),
ctx.trx.getTrxName()); getTrxName(ctx));
} }
/** /**
@ -173,7 +173,7 @@ public abstract class AbstractElementHandler implements ElementHandler {
*/ */
public int findIdByColumnAndParentId (PIPOContext ctx, String tableName, String columnName, String name, String tableNameMaster, int masterID, boolean ignoreCase) { public int findIdByColumnAndParentId (PIPOContext ctx, String tableName, String columnName, String name, String tableNameMaster, int masterID, boolean ignoreCase) {
return IDFinder.findIdByColumnAndParentId(tableName, columnName, name, tableNameMaster, masterID, getClientId(ctx.ctx), return IDFinder.findIdByColumnAndParentId(tableName, columnName, name, tableNameMaster, masterID, getClientId(ctx.ctx),
ignoreCase, ctx.trx.getTrxName()); ignoreCase, getTrxName(ctx));
} }
/** /**
@ -185,7 +185,7 @@ public abstract class AbstractElementHandler implements ElementHandler {
* @param masterID * @param masterID
*/ */
public int findIdByNameAndParentId (PIPOContext ctx, String tableName, String name, String tableNameMaster, int masterID) { public int findIdByNameAndParentId (PIPOContext ctx, String tableName, String name, String tableNameMaster, int masterID) {
return IDFinder.findIdByNameAndParentId(tableName, name, tableNameMaster, masterID, getClientId(ctx.ctx), ctx.trx.getTrxName()); return IDFinder.findIdByNameAndParentId(tableName, name, tableNameMaster, masterID, getClientId(ctx.ctx), getTrxName(ctx));
} }
/** /**
@ -203,7 +203,7 @@ public abstract class AbstractElementHandler implements ElementHandler {
int tableID = findIdByColumn(ctx, "AD_Table", "TableName", tableName); int tableID = findIdByColumn(ctx, "AD_Table", "TableName", tableName);
POInfo poInfo = POInfo.getPOInfo(ctx.ctx, tableID); POInfo poInfo = POInfo.getPOInfo(ctx.ctx, tableID);
PreparedStatement pstmtReferenceId = DB.prepareStatement("SELECT AD_Reference_ID FROM AD_COLUMN WHERE AD_Column_ID = ?", ctx.trx.getTrxName()); PreparedStatement pstmtReferenceId = DB.prepareStatement("SELECT AD_Reference_ID FROM AD_COLUMN WHERE AD_Column_ID = ?", getTrxName(ctx));
ResultSet rs=null; ResultSet rs=null;
try{ try{
@ -220,7 +220,7 @@ public abstract class AbstractElementHandler implements ElementHandler {
if (rs.next()) if (rs.next())
referenceID = rs.getInt(1); referenceID = rs.getInt(1);
X_AD_Package_Imp_Backup backup = new X_AD_Package_Imp_Backup(ctx.ctx, 0, ctx.trx.getTrxName()); X_AD_Package_Imp_Backup backup = new X_AD_Package_Imp_Backup(ctx.ctx, 0, getTrxName(ctx));
backup.setAD_Org_ID(Env.getAD_Org_ID(ctx.ctx)); backup.setAD_Org_ID(Env.getAD_Org_ID(ctx.ctx));
backup.setAD_Package_Imp_ID(getPackageImpId(ctx.ctx)); backup.setAD_Package_Imp_ID(getPackageImpId(ctx.ctx));
backup.setAD_Package_Imp_Detail_ID(AD_Package_Imp_Detail_ID); backup.setAD_Package_Imp_Detail_ID(AD_Package_Imp_Detail_ID);
@ -560,7 +560,7 @@ public abstract class AbstractElementHandler implements ElementHandler {
if (element.properties.containsKey(uuidColumn)) { if (element.properties.containsKey(uuidColumn)) {
String uuid = element.properties.get(uuidColumn).contents.toString(); String uuid = element.properties.get(uuidColumn).contents.toString();
if (uuid != null && uuid.trim().length() == 36) { if (uuid != null && uuid.trim().length() == 36) {
Query query = new Query(ctx.ctx, tableName, uuidColumn+"=?", ctx.trx.getTrxName()); Query query = new Query(ctx.ctx, tableName, uuidColumn+"=?", getTrxName(ctx));
po = query.setParameters(uuid.trim()).firstOnly(); po = query.setParameters(uuid.trim()).firstOnly();
} }
} }
@ -568,7 +568,7 @@ public abstract class AbstractElementHandler implements ElementHandler {
if (po == null && element.properties.containsKey(idColumn)) { if (po == null && element.properties.containsKey(idColumn)) {
String id = element.properties.get(idColumn).contents.toString(); String id = element.properties.get(idColumn).contents.toString();
if (id != null && id.trim().length() > 0) { if (id != null && id.trim().length() > 0) {
Query query = new Query(ctx.ctx, tableName, idColumn+"=?", ctx.trx.getTrxName()); Query query = new Query(ctx.ctx, tableName, idColumn+"=?", getTrxName(ctx));
po = query.setParameters(Integer.valueOf(id.trim())).firstOnly(); po = query.setParameters(Integer.valueOf(id.trim())).firstOnly();
} }
} }

6
org.adempiere.pipo/src/org/adempiere/pipo2/GridTab2PackExporter.java
View File

@ -46,6 +46,7 @@ public class GridTab2PackExporter implements IGridTabExporter {
public void export(GridTab gridTab, List<GridTab> childs, boolean currentRowOnly, File file) { public void export(GridTab gridTab, List<GridTab> childs, boolean currentRowOnly, File file) {
String tableName = gridTab.getTableName(); String tableName = gridTab.getTableName();
PackOut packOut = new PackOut(); PackOut packOut = new PackOut();
packOut.setCtx(Env.getCtx());
Map properties = new HashMap(); Map properties = new HashMap();
properties.putAll(Env.getCtx()); properties.putAll(Env.getCtx());
List<PackoutItem> packoutItems = new ArrayList<PackoutItem>(); List<PackoutItem> packoutItems = new ArrayList<PackoutItem>();
@ -54,14 +55,15 @@ public class GridTab2PackExporter implements IGridTabExporter {
StringBuffer sql = new StringBuffer("SELECT * FROM "); StringBuffer sql = new StringBuffer("SELECT * FROM ");
sql.append(tableName); sql.append(tableName);
if (currentRowOnly) { if (currentRowOnly) {
sql.append(" WHERE ").append(tableName).append("_ID=").append(gridTab.getRecord_ID()); sql.append(" WHERE ").append(gridTab.getTableModel().getWhereClause(gridTab.getCurrentRow()));
} else { } else {
for(int i = 0; i < gridTab.getRowCount(); i++) { for(int i = 0; i < gridTab.getRowCount(); i++) {
if (i == 0) if (i == 0)
sql.append(" WHERE "); sql.append(" WHERE ");
else else
sql.append(" OR "); sql.append(" OR ");
sql.append(tableName).append("_ID=").append(gridTab.getKeyID(i)); gridTab.navigate(i);
sql.append(gridTab.getTableModel().getWhereClause(gridTab.getCurrentRow()));
} }
} }
for(GridTab child : childs) { for(GridTab child : childs) {

3
org.adempiere.pipo/src/org/adempiere/pipo2/PackOut.java
View File

@ -294,7 +294,8 @@ public class PackOut
} }
private void initContext() { private void initContext() {
pipoContext.trx = Trx.get(trxName, true); if (trxName != null)
pipoContext.trx = Trx.get(trxName, true);
pipoContext.packOut = this; pipoContext.packOut = this;
} }