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

BF[2869715] dba_free_space does not exists on postgres 

https://sourceforge.net/tracker/?func=detail&aid=2869715&group_id=176962&atid=879332
Alert Processor must get only active Alerts!
Small Typo mistake fixes.
This commit is contained in:
trifonnt 2009-09-29 14:21:47 +00:00
parent edf6266ce0
commit 0661da10cb
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/src/org/compiere/model/MAlertProcessor.java
View File

@ -187,7 +187,7 @@ public class MAlertProcessor extends X_AD_AlertProcessor
if (alerts != null && !reload) if (alerts != null && !reload)
return alerts; return alerts;
String sql = "SELECT * FROM AD_Alert " String sql = "SELECT * FROM AD_Alert "
+ "WHERE AD_AlertProcessor_ID=?"; + "WHERE AD_AlertProcessor_ID=? AND IsActive='Y' ";
ArrayList<MAlert> list = new ArrayList<MAlert>(); ArrayList<MAlert> list = new ArrayList<MAlert>();
PreparedStatement pstmt = null; PreparedStatement pstmt = null;
ResultSet rs = null; ResultSet rs = null;

12
serverRoot/src/main/server/org/compiere/server/AlertProcessor.java
View File

@ -77,7 +77,7 @@ public class AlertProcessor extends AdempiereServer
private StringBuffer m_summary = new StringBuffer(); private StringBuffer m_summary = new StringBuffer();
/** Last Error Msg */ /** Last Error Msg */
private StringBuffer m_errors = new StringBuffer(); private StringBuffer m_errors = new StringBuffer();
/** Client onfo */ /** Client info */
private MClient m_client = null; private MClient m_client = null;
/** /**
@ -268,7 +268,7 @@ public class AlertProcessor extends AdempiereServer
try { try {
trx = Trx.get(Trx.createTrxName("AP_NU"), true); trx = Trx.get(Trx.createTrxName("AP_NU"), true);
// Notice // Notice
int AD_Message_ID = 52244; /* Hardcoded message=notes */ int AD_Message_ID = 52244; /* TODO - Hardcoded message=notes */
MNote note = new MNote(getCtx(), AD_Message_ID, user_id, trx.getTrxName()); MNote note = new MNote(getCtx(), AD_Message_ID, user_id, trx.getTrxName());
note.setClientOrg(m_model.getAD_Client_ID(), m_model.getAD_Org_ID()); note.setClientOrg(m_model.getAD_Client_ID(), m_model.getAD_Org_ID());
note.setTextMsg(message); note.setTextMsg(message);
@ -345,7 +345,7 @@ public class AlertProcessor extends AdempiereServer
rs = null; pstmt = null; rs = null; pstmt = null;
} }
// Error occured // Error occurred
if (error != null) if (error != null)
throw new Exception ("(" + sql + ") " + Env.NL throw new Exception ("(" + sql + ") " + Env.NL
+ error.getLocalizedMessage()); + error.getLocalizedMessage());
@ -402,7 +402,7 @@ public class AlertProcessor extends AdempiereServer
rs = null; pstmt = null; rs = null; pstmt = null;
} }
// Error occured // Error occurred
if (error != null) if (error != null)
throw new Exception ("(" + sql + ") " + Env.NL throw new Exception ("(" + sql + ") " + Env.NL
+ error.getLocalizedMessage()); + error.getLocalizedMessage());
@ -457,6 +457,6 @@ public class AlertProcessor extends AdempiereServer
ap.start(); ap.start();
} // main }
} // AlertProcessor }