details: https://code.openbravo.com/erp/devel/pi/rev/e2583dc97f70 changeset: 24260:e2583dc97f70 user: Rafa Alonso <rafael.alonso <at> openbravo.com> date: Thu Aug 14 22:20:53 2014 +0200 summary: Fixes issue 26953: it wasn't a better solution after all... Backed out rev 24258
details: https://code.openbravo.com/erp/devel/pi/rev/a5a296d4988d changeset: 24261:a5a296d4988d user: Rafa Alonso <rafael.alonso <at> openbravo.com> date: Thu Aug 14 22:23:15 2014 +0200 summary: Merge from local diffstat: modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseKernelServlet.java | 13 +++-- src-db/database/model/triggers/M_CH_SUBSET_VALUE_TRG.xml | 22 ++++++++- src-db/database/model/triggers/M_CH_VALUE_TRG.xml | 19 +++++++- src-db/database/sourcedata/AD_REF_LIST.xml | 11 +++++ 4 files changed, 54 insertions(+), 11 deletions(-) diffs (141 lines): diff -r 2d3dfb5d3eaf -r a5a296d4988d modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseKernelServlet.java --- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseKernelServlet.java Thu Aug 14 20:54:39 2014 +0200 +++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseKernelServlet.java Thu Aug 14 22:23:15 2014 +0200 @@ -66,13 +66,14 @@ logout(request, localResponse); } - // get where the request originated or pick up the localResponse.getRedirectTarget() - String referer = RequestContext.get().getRequest().getHeader("referer"); - if (referer == null) { - referer = localResponse.getRedirectTarget(); - } - if (referer != null) { + if (localResponse.getRedirectTarget() != null) { if (!response.isCommitted()) { + // get where the request originated + String referer = RequestContext.get().getRequest().getHeader("referer"); + // if we can't get where the request originated, redirect to the ERP + if (referer == null) { + referer = localResponse.getRedirectTarget(); + } // will this always work.... not if the writer is already closed response.getWriter().write("window.location.href = '" + referer + "';"); response.setHeader("Content-Type", KernelConstants.JAVASCRIPT_CONTENTTYPE); diff -r 2d3dfb5d3eaf -r a5a296d4988d src-db/database/model/triggers/M_CH_SUBSET_VALUE_TRG.xml --- a/src-db/database/model/triggers/M_CH_SUBSET_VALUE_TRG.xml Thu Aug 14 20:54:39 2014 +0200 +++ b/src-db/database/model/triggers/M_CH_SUBSET_VALUE_TRG.xml Thu Aug 14 22:23:15 2014 +0200 @@ -14,17 +14,33 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU -* All portions are Copyright (C) 2013 Openbravo SLU +* All portions are Copyright (C) 2013-2014 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ - v_characteristic_id NVARCHAR2(32); + v_characteristic_id NVARCHAR2(32); + v_active VARCHAR2(32):='N'; + v_exist NUMBER:=0; BEGIN IF (AD_isTriggerEnabled()='N') THEN RETURN; END IF; -- Insert values in generic products using the subset IF (INSERTING) THEN + + select count(*) into v_exist + from ad_preference + where ad_client_id=:new.ad_client_id + and property='IsActiveNewChValueProd'; + + IF (v_exist > 0) THEN + select value into v_active + from ad_preference + where ad_client_id=:new.ad_client_id + and property='IsActiveNewChValueProd'; + END IF; + + SELECT m_characteristic_id INTO v_characteristic_id FROM m_ch_subset WHERE :new.m_ch_subset_id = m_ch_subset_id; @@ -33,7 +49,7 @@ created, createdby, updated, updatedby, m_product_ch_id, m_ch_value_id, skcode ) SELECT - get_uuid(), :new.ad_client_id, :new.ad_org_id, 'N', + get_uuid(), :new.ad_client_id, :new.ad_org_id, v_active, now(), :new.createdby, now(), :new.updatedby, pch.m_product_ch_id, :new.m_ch_value_id, :new.skcode FROM m_product_ch pch diff -r 2d3dfb5d3eaf -r a5a296d4988d src-db/database/model/triggers/M_CH_VALUE_TRG.xml --- a/src-db/database/model/triggers/M_CH_VALUE_TRG.xml Thu Aug 14 20:54:39 2014 +0200 +++ b/src-db/database/model/triggers/M_CH_VALUE_TRG.xml Thu Aug 14 22:23:15 2014 +0200 @@ -14,7 +14,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU -* All portions are Copyright (C) 2013 Openbravo SLU +* All portions are Copyright (C) 2013-2014 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -23,6 +23,8 @@ v_Parent_ID VARCHAR2(32); v_NextNo VARCHAR2(32); v_count NUMBER; + v_active VARCHAR2(32):='N'; + v_exist NUMBER:=0; BEGIN IF (AD_isTriggerEnabled()='N') THEN @@ -63,12 +65,25 @@ END ); END IF; + + select count(*) into v_exist + from ad_preference + where ad_client_id=:new.ad_client_id + and property='IsActiveNewChValueProd'; + + IF (v_exist > 0) THEN + select value into v_active + from ad_preference + where ad_client_id=:new.ad_client_id + and property='IsActiveNewChValueProd'; + END IF; + INSERT INTO m_product_ch_conf ( m_product_ch_conf_id, ad_client_id, ad_org_id, isactive, created, createdby, updated, updatedby, m_product_ch_id, m_ch_value_id, skcode ) SELECT - get_uuid(), :new.ad_client_id, :new.ad_org_id, 'N', + get_uuid(), :new.ad_client_id, :new.ad_org_id, v_active, now(), :new.createdby, now(), :new.updatedby, pch.m_product_ch_id, :new.m_ch_value_id, :new.skcode FROM m_product_ch pch diff -r 2d3dfb5d3eaf -r a5a296d4988d src-db/database/sourcedata/AD_REF_LIST.xml --- a/src-db/database/sourcedata/AD_REF_LIST.xml Thu Aug 14 20:54:39 2014 +0200 +++ b/src-db/database/sourcedata/AD_REF_LIST.xml Thu Aug 14 22:23:15 2014 +0200 @@ -12536,6 +12536,17 @@ <!--FBCE5CC9E77A43ED8ABBE27FC48F2C06--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--FBCE5CC9E77A43ED8ABBE27FC48F2C06--></AD_REF_LIST> +<!--FD134D58B4A14BB1AA5F4870020E8CB5--><AD_REF_LIST> +<!--FD134D58B4A14BB1AA5F4870020E8CB5--> <AD_REF_LIST_ID><![CDATA[FD134D58B4A14BB1AA5F4870020E8CB5]]></AD_REF_LIST_ID> +<!--FD134D58B4A14BB1AA5F4870020E8CB5--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> +<!--FD134D58B4A14BB1AA5F4870020E8CB5--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> +<!--FD134D58B4A14BB1AA5F4870020E8CB5--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> +<!--FD134D58B4A14BB1AA5F4870020E8CB5--> <VALUE><![CDATA[IsActiveNewChValueProd]]></VALUE> +<!--FD134D58B4A14BB1AA5F4870020E8CB5--> <NAME><![CDATA[Active new chValue in Product]]></NAME> +<!--FD134D58B4A14BB1AA5F4870020E8CB5--> <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID> +<!--FD134D58B4A14BB1AA5F4870020E8CB5--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> +<!--FD134D58B4A14BB1AA5F4870020E8CB5--></AD_REF_LIST> + <!--FD374D3374054128A14530F1A71A72D8--><AD_REF_LIST> <!--FD374D3374054128A14530F1A71A72D8--> <AD_REF_LIST_ID><![CDATA[FD374D3374054128A14530F1A71A72D8]]></AD_REF_LIST_ID> <!--FD374D3374054128A14530F1A71A72D8--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> ------------------------------------------------------------------------------ _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
