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

IDEMPIERE-1905 Add feedback to time-consuming processes

This commit is contained in:
Carlos Ruiz 2014-04-16 09:17:02 -05:00
parent bd8bdb6cc9
commit 3f0f694709
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.adempiere.base/src/org/adempiere/process/UUIDGenerator.java
View File

@ -36,6 +36,7 @@ import org.compiere.util.CLogger;
import org.compiere.util.DB; import org.compiere.util.DB;
import org.compiere.util.DisplayType; import org.compiere.util.DisplayType;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.Msg;
import org.compiere.util.Trx; import org.compiere.util.Trx;
import org.compiere.util.ValueNamePair; import org.compiere.util.ValueNamePair;
@ -91,6 +92,7 @@ public class UUIDGenerator extends SvrProcess {
while(rs.next()) { while(rs.next()) {
int AD_Table_ID = rs.getInt(1); int AD_Table_ID = rs.getInt(1);
String cTableName = rs.getString(2); String cTableName = rs.getString(2);
statusUpdate(Msg.getMsg(getCtx(), "Processing") + " " + cTableName);
String columnName = PO.getUUIDColumnName(cTableName); String columnName = PO.getUUIDColumnName(cTableName);
int AD_Column_ID = DB.getSQLValue(null, "SELECT AD_Column_ID FROM AD_Column Where AD_Table_ID = ? AND ColumnName = ?", AD_Table_ID, columnName); int AD_Column_ID = DB.getSQLValue(null, "SELECT AD_Column_ID FROM AD_Column Where AD_Table_ID = ? AND ColumnName = ?", AD_Table_ID, columnName);

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

@ -508,7 +508,7 @@ public abstract class AbstractElementHandler implements ElementHandler {
String uidColumn = po.getUUIDColumnName(); String uidColumn = po.getUUIDColumnName();
String[] keys = po.get_KeyColumns(); String[] keys = po.get_KeyColumns();
if (Util.isEmpty((String)po.get_Value(uidColumn)) && (keys == null || keys.length != 1 || po.get_ID() > MTable.MAX_OFFICIAL_ID)) { if (Util.isEmpty((String)po.get_Value(uidColumn)) && (keys == null || keys.length != 1 || po.get_ID() > MTable.MAX_OFFICIAL_ID)) {
throw new IllegalStateException("2Pack doesn't work with record without official Id and UUID"); throw new IllegalStateException("2Pack doesn't work with record without official Id and UUID -> " + po.getUUIDColumnName());
} }
} }