details: https://code.openbravo.com/erp/devel/pi/rev/797f69e6a899 changeset: 19927:797f69e6a899 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Mon Mar 18 16:15:42 2013 +0530 summary: Fixes Issue 22912 : Where clause is not applied in tree view
Code Refactoring and applying code review changes. details: https://code.openbravo.com/erp/devel/pi/rev/39233b3f5735 changeset: 19928:39233b3f5735 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Mon Mar 18 17:18:15 2013 +0530 summary: Fixes Issue 0023198: Centralization of EmailServerConfiguration Added email server configuration to Utility and applied code review changes diffstat: src/org/openbravo/erpCommon/utility/Utility.java | 46 ++++++++++ src/org/openbravo/erpCommon/utility/WindowTree.java | 4 +- src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java | 40 +-------- 3 files changed, 48 insertions(+), 42 deletions(-) diffs (164 lines): diff -r 5063a773aa20 -r 39233b3f5735 src/org/openbravo/erpCommon/utility/Utility.java --- a/src/org/openbravo/erpCommon/utility/Utility.java Mon Mar 18 12:48:08 2013 +0100 +++ b/src/org/openbravo/erpCommon/utility/Utility.java Mon Mar 18 17:18:15 2013 +0530 @@ -65,12 +65,15 @@ import org.apache.log4j.Logger; import org.hibernate.Query; +import org.hibernate.criterion.Restrictions; import org.openbravo.base.HttpBaseServlet; import org.openbravo.base.exception.OBException; import org.openbravo.base.provider.OBConfigFileProvider; import org.openbravo.base.secureApp.OrgTree; import org.openbravo.base.secureApp.VariablesSecureApp; import org.openbravo.dal.core.OBContext; +import org.openbravo.dal.security.OrganizationStructureProvider; +import org.openbravo.dal.service.OBCriteria; import org.openbravo.dal.service.OBDal; import org.openbravo.data.FieldProvider; import org.openbravo.data.Sqlc; @@ -85,6 +88,7 @@ import org.openbravo.model.ad.ui.Tab; import org.openbravo.model.ad.ui.Window; import org.openbravo.model.ad.utility.Image; +import org.openbravo.model.common.enterprise.EmailServerConfiguration; import org.openbravo.model.common.enterprise.Organization; import org.openbravo.model.common.enterprise.OrganizationInformation; import org.openbravo.model.common.geography.Country; @@ -2600,4 +2604,46 @@ OBContext.restorePreviousMode(); } } + + /* + * Retrieves the email configuration of the Organization + * + * @param Organization Organization whose email server configuration is to be retrieved. + * + * @return EmailServerConfiguration of the Organization. + */ + public static EmailServerConfiguration getEmailConfiguration(Organization organization) { + EmailServerConfiguration emailConfiguration = null; + try { + if (organization != null) { + OBCriteria<EmailServerConfiguration> mailConfigCriteria = OBDal.getInstance() + .createCriteria(EmailServerConfiguration.class); + mailConfigCriteria.add(Restrictions.eq(EmailServerConfiguration.PROPERTY_ORGANIZATION, + organization)); + List<EmailServerConfiguration> mailConfigList = null; + // if the current organization is *, return email configuration if present, else return + // null + if (organization.getId().equals("0")) { + mailConfigList = mailConfigCriteria.list(); + if (mailConfigList.size() != 0) { + emailConfiguration = mailConfigList.get(0); + return emailConfiguration; + } else { + return null; + } + } else { + mailConfigList = mailConfigCriteria.list(); + if (mailConfigList.size() == 0) { + OrganizationStructureProvider orgStructure = new OrganizationStructureProvider(); + return getEmailConfiguration(orgStructure.getParentOrg(organization)); + } else { + emailConfiguration = mailConfigList.get(0); + } + } + } + } catch (Exception e) { + log4j.error("Exception while retrieving email configuration" + e); + } + return emailConfiguration; + } } diff -r 5063a773aa20 -r 39233b3f5735 src/org/openbravo/erpCommon/utility/WindowTree.java --- a/src/org/openbravo/erpCommon/utility/WindowTree.java Mon Mar 18 12:48:08 2013 +0100 +++ b/src/org/openbravo/erpCommon/utility/WindowTree.java Mon Mar 18 17:18:15 2013 +0530 @@ -240,16 +240,14 @@ List<WindowTreeData> newSubList = new ArrayList<WindowTreeData>(); if (hqlWhereClause != null && !hqlWhereClause.trim().isEmpty()) { - hqlWhereClause = (hqlWhereClause != null && !hqlWhereClause.trim().isEmpty()) ? hqlWhereClause - : "1=1"; hqlWhereClause = hqlWhereClause.replace("e.", ""); OBQuery<BaseOBObject> entityResults = OBDal.getInstance().createQuery("" + entityName + "", hqlWhereClause); if (nodeIdList == null) { nodeIdList = new ArrayList<String>(); } + if (nodeIdList.size() == 0 && nodeIdList.size() != entityResults.count()) { - ScrollableResults entityData = entityResults.scroll(ScrollMode.FORWARD_ONLY); int clearEachLoops = 100; int i = 0; diff -r 5063a773aa20 -r 39233b3f5735 src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java --- a/src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java Mon Mar 18 12:48:08 2013 +0100 +++ b/src/org/openbravo/erpCommon/utility/reporting/printing/PrintController.java Mon Mar 18 17:18:15 2013 +0530 @@ -43,13 +43,11 @@ import org.apache.commons.fileupload.FileItem; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; -import org.hibernate.criterion.Restrictions; import org.openbravo.base.exception.OBException; import org.openbravo.base.secureApp.HttpSecureAppServlet; import org.openbravo.base.secureApp.VariablesSecureApp; import org.openbravo.base.session.OBPropertiesProvider; import org.openbravo.dal.core.OBContext; -import org.openbravo.dal.security.OrganizationStructureProvider; import org.openbravo.dal.service.OBCriteria; import org.openbravo.dal.service.OBDal; import org.openbravo.erpCommon.utility.OBError; @@ -918,7 +916,7 @@ throw new ServletException("No Poc configuration found for this client."); } - EmailServerConfiguration mailConfig = getEmailConfiguration(OBDal.getInstance().get( + EmailServerConfiguration mailConfig = Utility.getEmailConfiguration(OBDal.getInstance().get( Organization.class, vars.getOrg())); if (mailConfig == null) { @@ -1129,42 +1127,6 @@ out.close(); } - private EmailServerConfiguration getEmailConfiguration(Organization organization) { - EmailServerConfiguration emailConfiguration = null; - try { - if (organization != null) { - OBCriteria<EmailServerConfiguration> mailConfigCriteria = OBDal.getInstance() - .createCriteria(EmailServerConfiguration.class); - mailConfigCriteria.addOrderBy("client.id", false); - mailConfigCriteria.add(Restrictions.eq(EmailServerConfiguration.PROPERTY_ORGANIZATION, - organization)); - List<EmailServerConfiguration> mailConfigList = null; - // if the current organization is *, return email configuration if present, else return - // null - if (organization.getId().equals("0")) { - mailConfigList = mailConfigCriteria.list(); - if (mailConfigList.size() != 0) { - emailConfiguration = mailConfigList.get(0); - return emailConfiguration; - } else { - return null; - } - } else { - mailConfigList = mailConfigCriteria.list(); - if (mailConfigList.size() == 0) { - OrganizationStructureProvider orgStructure = new OrganizationStructureProvider(); - return getEmailConfiguration(orgStructure.getParentOrg(organization)); - } else { - emailConfiguration = mailConfigList.get(0); - } - } - } - } catch (Exception e) { - log4j.error("Exception while retrieving email configuration" + e); - } - return emailConfiguration; - } - private boolean moreThanOneLenguageDefined(Map<String, Report> reports) throws ReportingException { @SuppressWarnings("rawtypes") Iterator itRep = reports.values().iterator(); ------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_mar _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
