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

Merge with bb4917e1ab96314cac1a7cce2dd791c0e0a8279c

This commit is contained in:
Heng Sin Low 2012-07-04 16:26:00 +08:00
parent f99d832907 b60cb7394b
commit 041cd87273
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
org.adempiere.base/src/org/compiere/dbPort/Convert.java
View File

@ -478,10 +478,13 @@ public abstract class Convert
} }
private static boolean dontLog(String statement) { private static boolean dontLog(String statement) {
// Do not log *Access records - teo_Sarca BF [ 2782095 ]
// IDEMPIERE-323 Migration script log AD_Document_Action_Access (nmicoud / CarlosRuiz_globalqss)
String [] exceptionTables = new String[] { String [] exceptionTables = new String[] {
"AD_ACCESSLOG", "AD_ACCESSLOG",
"AD_ALERTPROCESSORLOG", "AD_ALERTPROCESSORLOG",
"AD_CHANGELOG", "AD_CHANGELOG",
"AD_DOCUMENT_ACTION_ACCESS",
"AD_ISSUE", "AD_ISSUE",
"AD_LDAPPROCESSORLOG", "AD_LDAPPROCESSORLOG",
"AD_PACKAGE_IMP", "AD_PACKAGE_IMP",
@ -492,10 +495,13 @@ public abstract class Convert
"AD_PINSTANCE", "AD_PINSTANCE",
"AD_PINSTANCE_LOG", "AD_PINSTANCE_LOG",
"AD_PINSTANCE_PARA", "AD_PINSTANCE_PARA",
"AD_PROCESS_ACCESS",
"AD_RECENTITEM", "AD_RECENTITEM",
"AD_REPLICATION_LOG", "AD_REPLICATION_LOG",
"AD_SCHEDULERLOG", "AD_SCHEDULERLOG",
"AD_SESSION", "AD_SESSION",
"AD_WINDOW_ACCESS",
"AD_WORKFLOW_ACCESS",
"AD_WORKFLOWPROCESSORLOG", "AD_WORKFLOWPROCESSORLOG",
"CM_WEBACCESSLOG", "CM_WEBACCESSLOG",
"C_ACCTPROCESSORLOG", "C_ACCTPROCESSORLOG",
@ -513,13 +519,7 @@ public abstract class Convert
"T_SELECTION2", "T_SELECTION2",
"T_SPOOL", "T_SPOOL",
"T_TRANSACTION", "T_TRANSACTION",
"T_TRIALBALANCE", "T_TRIALBALANCE"
// Do not log *Access records - teo_Sarca BF [ 2782095 ]
"AD_PROCESS_ACCESS",
"AD_WINDOW_ACCESS",
"AD_WORKFLOW_ACCESS",
"AD_FORM_ACCESS",
//
}; };
String uppStmt = statement.toUpperCase().trim(); String uppStmt = statement.toUpperCase().trim();
// don't log selects // don't log selects

6
org.adempiere.ui.swing/src/org/compiere/apps/ProcessParameterPanel.java
View File

@ -458,7 +458,8 @@ public class ProcessParameterPanel extends CPanel implements VetoableChangeListe
if (!comp.isVisible()) { if (!comp.isVisible()) {
changedSize = true; changedSize = true;
comp.setVisible(true); // visibility comp.setVisible(true); // visibility
m_labels.get(index).setVisible(true); if (m_labels.get(index) != null)
m_labels.get(index).setVisible(true);
if (m_mFields.get(index).getVO().isRange) if (m_mFields.get(index).getVO().isRange)
m_separators.get(index).setText(" - "); m_separators.get(index).setText(" - ");
} }
@ -470,7 +471,8 @@ public class ProcessParameterPanel extends CPanel implements VetoableChangeListe
if (comp.isVisible()) { if (comp.isVisible()) {
changedSize = true; changedSize = true;
comp.setVisible(false); comp.setVisible(false);
m_labels.get(index).setVisible(false); if (m_labels.get(index) != null)
m_labels.get(index).setVisible(false);
if (m_mFields.get(index).getVO().isRange) if (m_mFields.get(index).getVO().isRange)
m_separators.get(index).setText(""); m_separators.get(index).setText("");
} }