details: https://code.openbravo.com/erp/devel/pi/rev/96afde6d0c69 changeset: 13192:96afde6d0c69 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jul 19 13:20:19 2011 +0200 summary: related to issue 16134: Apply config script is used for ETag
details: https://code.openbravo.com/erp/devel/pi/rev/ba65e8f92c8a changeset: 13193:ba65e8f92c8a user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Tue Jul 19 13:21:35 2011 +0200 summary: fixed bug 16134: Window definition is not refreshed with "Allow Customization" diffstat: modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponent.java | 6 +- src-db/database/sourcedata/AD_CALLOUT.xml | 9 + src-db/database/sourcedata/AD_COLUMN.xml | 1 + src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 12 ++ src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 10 + src/org/openbravo/erpCommon/ad_callouts/SysInfoCustomAllowed.java | 55 ++++++++++ 6 files changed, 92 insertions(+), 1 deletions(-) diffs (147 lines): diff -r 1a9595fd3a9e -r ba65e8f92c8a modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponent.java --- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponent.java Tue Jul 19 10:03:47 2011 +0200 +++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseComponent.java Tue Jul 19 13:21:35 2011 +0200 @@ -217,7 +217,11 @@ OBCriteria<Module> qMod = OBDal.getInstance().createCriteria(Module.class); qMod.addOrder(Order.asc(Module.PROPERTY_ID)); for (Module mod : qMod.list()) { - moduleVersions += mod.getId() + "-" + mod.getVersion() + "-" + mod.isEnabled() + "\n"; + moduleVersions += mod.getId() + "-" + mod.getVersion() + "-" + mod.isEnabled(); + if ("T".equals(mod.getType())) { + moduleVersions += "-" + mod.isApplyConfigurationScript(); + } + moduleVersions += "\n"; } moduleVersionHash = DigestUtils.md5Hex(moduleVersions); log4j.debug("New moduleVersionHash. Original: " + moduleVersions + " hash:" diff -r 1a9595fd3a9e -r ba65e8f92c8a src-db/database/sourcedata/AD_CALLOUT.xml --- a/src-db/database/sourcedata/AD_CALLOUT.xml Tue Jul 19 10:03:47 2011 +0200 +++ b/src-db/database/sourcedata/AD_CALLOUT.xml Tue Jul 19 13:21:35 2011 +0200 @@ -958,6 +958,15 @@ <!--F6E343E77DA249559AEF8651D595E880--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--F6E343E77DA249559AEF8651D595E880--></AD_CALLOUT> +<!--FF8080813141FBE30131420735D80013--><AD_CALLOUT> +<!--FF8080813141FBE30131420735D80013--> <AD_CALLOUT_ID><![CDATA[FF8080813141FBE30131420735D80013]]></AD_CALLOUT_ID> +<!--FF8080813141FBE30131420735D80013--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--FF8080813141FBE30131420735D80013--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--FF8080813141FBE30131420735D80013--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--FF8080813141FBE30131420735D80013--> <NAME><![CDATA[SysInfoCustomAllowed]]></NAME> +<!--FF8080813141FBE30131420735D80013--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--FF8080813141FBE30131420735D80013--></AD_CALLOUT> + <!--FF8081812FBFF0CC012FBFF53E16000A--><AD_CALLOUT> <!--FF8081812FBFF0CC012FBFF53E16000A--> <AD_CALLOUT_ID><![CDATA[FF8081812FBFF0CC012FBFF53E16000A]]></AD_CALLOUT_ID> <!--FF8081812FBFF0CC012FBFF53E16000A--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 1a9595fd3a9e -r ba65e8f92c8a src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Tue Jul 19 10:03:47 2011 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Tue Jul 19 13:21:35 2011 +0200 @@ -223764,6 +223764,7 @@ <!--5BE185F526BBFA15E040007F01016962--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> <!--5BE185F526BBFA15E040007F01016962--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> <!--5BE185F526BBFA15E040007F01016962--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> +<!--5BE185F526BBFA15E040007F01016962--> <AD_CALLOUT_ID><![CDATA[FF8080813141FBE30131420735D80013]]></AD_CALLOUT_ID> <!--5BE185F526BBFA15E040007F01016962--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> <!--5BE185F526BBFA15E040007F01016962--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--5BE185F526BBFA15E040007F01016962--> <POSITION><![CDATA[24]]></POSITION> diff -r 1a9595fd3a9e -r ba65e8f92c8a src-db/database/sourcedata/AD_MODEL_OBJECT.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Tue Jul 19 10:03:47 2011 +0200 +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT.xml Tue Jul 19 13:21:35 2011 +0200 @@ -3737,6 +3737,18 @@ <!--8E86ECAC98194E5985A2E6B5DEC3C870--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> <!--8E86ECAC98194E5985A2E6B5DEC3C870--></AD_MODEL_OBJECT> +<!--9282C90A36A848ADBA7ACED8CDF02304--><AD_MODEL_OBJECT> +<!--9282C90A36A848ADBA7ACED8CDF02304--> <AD_MODEL_OBJECT_ID><![CDATA[9282C90A36A848ADBA7ACED8CDF02304]]></AD_MODEL_OBJECT_ID> +<!--9282C90A36A848ADBA7ACED8CDF02304--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--9282C90A36A848ADBA7ACED8CDF02304--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--9282C90A36A848ADBA7ACED8CDF02304--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--9282C90A36A848ADBA7ACED8CDF02304--> <ACTION><![CDATA[C]]></ACTION> +<!--9282C90A36A848ADBA7ACED8CDF02304--> <CLASSNAME><![CDATA[org.openbravo.erpCommon.ad_callouts.SysInfoCustomAllowed]]></CLASSNAME> +<!--9282C90A36A848ADBA7ACED8CDF02304--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> +<!--9282C90A36A848ADBA7ACED8CDF02304--> <AD_CALLOUT_ID><![CDATA[FF8080813141FBE30131420735D80013]]></AD_CALLOUT_ID> +<!--9282C90A36A848ADBA7ACED8CDF02304--> <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE> +<!--9282C90A36A848ADBA7ACED8CDF02304--></AD_MODEL_OBJECT> + <!--9453509D1DAA4A5990FA2DB6F9C709FC--><AD_MODEL_OBJECT> <!--9453509D1DAA4A5990FA2DB6F9C709FC--> <AD_MODEL_OBJECT_ID><![CDATA[9453509D1DAA4A5990FA2DB6F9C709FC]]></AD_MODEL_OBJECT_ID> <!--9453509D1DAA4A5990FA2DB6F9C709FC--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 1a9595fd3a9e -r ba65e8f92c8a src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml --- a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Tue Jul 19 10:03:47 2011 +0200 +++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml Tue Jul 19 13:21:35 2011 +0200 @@ -3880,6 +3880,16 @@ <!--627B02B041C13FDCE040007F01012A65--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> <!--627B02B041C13FDCE040007F01012A65--></AD_MODEL_OBJECT_MAPPING> +<!--6731CF66A74346DD8B665BBA524C4787--><AD_MODEL_OBJECT_MAPPING> +<!--6731CF66A74346DD8B665BBA524C4787--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[6731CF66A74346DD8B665BBA524C4787]]></AD_MODEL_OBJECT_MAPPING_ID> +<!--6731CF66A74346DD8B665BBA524C4787--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--6731CF66A74346DD8B665BBA524C4787--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--6731CF66A74346DD8B665BBA524C4787--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--6731CF66A74346DD8B665BBA524C4787--> <AD_MODEL_OBJECT_ID><![CDATA[9282C90A36A848ADBA7ACED8CDF02304]]></AD_MODEL_OBJECT_ID> +<!--6731CF66A74346DD8B665BBA524C4787--> <MAPPINGNAME><![CDATA[/ad_callouts/SysInfoCustomAllowed.html]]></MAPPINGNAME> +<!--6731CF66A74346DD8B665BBA524C4787--> <ISDEFAULT><![CDATA[Y]]></ISDEFAULT> +<!--6731CF66A74346DD8B665BBA524C4787--></AD_MODEL_OBJECT_MAPPING> + <!--697C5F8E51D44DC1A78A9663D8A7EF72--><AD_MODEL_OBJECT_MAPPING> <!--697C5F8E51D44DC1A78A9663D8A7EF72--> <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[697C5F8E51D44DC1A78A9663D8A7EF72]]></AD_MODEL_OBJECT_MAPPING_ID> <!--697C5F8E51D44DC1A78A9663D8A7EF72--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff -r 1a9595fd3a9e -r ba65e8f92c8a src/org/openbravo/erpCommon/ad_callouts/SysInfoCustomAllowed.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/openbravo/erpCommon/ad_callouts/SysInfoCustomAllowed.java Tue Jul 19 13:21:35 2011 +0200 @@ -0,0 +1,55 @@ +/* + ************************************************************************* + * The contents of this file are subject to the Openbravo Public License + * Version 1.1 (the "License"), being the Mozilla Public License + * Version 1.1 with a permitted attribution clause; you may not use this + * file except in compliance with the License. You may obtain a copy of + * the License at http://www.openbravo.com/legal/license.html + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + * License for the specific language governing rights and limitations + * under the License. + * The Original Code is Openbravo ERP. + * The Initial Developer of the Original Code is Openbravo SLU + * All portions are Copyright (C) 2010 Openbravo SLU + * All Rights Reserved. + * Contributor(s): ______________________________________. + ************************************************************************ + */ + +package org.openbravo.erpCommon.ad_callouts; + +import javax.servlet.ServletException; + +import org.openbravo.base.filter.ValueListFilter; +import org.openbravo.client.application.event.ModuleHandler; +import org.openbravo.client.kernel.BaseComponent; + +/** + * This callout is executed when AD_System_Info.Customization_Allowed column value changes. In case + * this value is set to true, it nullifies module cache in other to detect the newly created in + * development template for the ETag. + * + * This is needed because currently System Info window is opened in 2.50 style, so + * {@link ModuleHandler}, which performs the same action, is not executed in this case. + * + * @see ModuleHandler + * @see BaseComponent#getETag() + * + * @author alostale + * + */ +public class SysInfoCustomAllowed extends SimpleCallout { + + private static final long serialVersionUID = 1L; + + @Override + protected void execute(CalloutInfo info) throws ServletException { + boolean customAllowed = info.getStringParameter("inpcustomizationAllowed", + new ValueListFilter("Y", "N", "")).equals("Y"); + if (customAllowed) { + BaseComponent.nullifyModuleCache(); + } + // No callout return needed + } +} ------------------------------------------------------------------------------ Magic Quadrant for Content-Aware Data Loss Prevention Research study explores the data loss prevention market. Includes in-depth analysis on the changes within the DLP market, and the criteria used to evaluate the strengths and weaknesses of these DLP solutions. http://www.accelacomm.com/jaw/sfnl/114/51385063/ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
