details: /erp/devel/pi/rev/b760ca672dc4 changeset: 9381:b760ca672dc4 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Dec 24 11:17:58 2010 +0100 summary: [cleanup] Do not iactive MO nor treenode when deactivating artifacts
details: /erp/devel/pi/rev/013d43b51f97 changeset: 9382:013d43b51f97 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Dec 24 11:19:01 2010 +0100 summary: [cleanup] 2.50 menu checks activeness of linked artifacts, not just MO details: /erp/devel/pi/rev/2f7abbedeae7 changeset: 9383:2f7abbedeae7 user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Dec 24 11:20:02 2010 +0100 summary: [cleanup] Activate inactived MO, MOM and treenodes to make them consistent details: /erp/devel/pi/rev/213c0378d57f changeset: 9384:213c0378d57f user: Asier Lostalé <asier.lostale <at> openbravo.com> date: Fri Dec 24 11:21:00 2010 +0100 summary: [cleanup] Removed from template uneeded menu, treenode, mo and mom changes diffstat: modules/org.openbravo.v3/src-db/database/configScript.xml | 220 -------------- src-db/database/model/triggers/AD_FORM_TRG2.xml | 28 +- src-db/database/model/triggers/AD_MENU_TRG.xml | 35 +- src-db/database/model/triggers/AD_WINDOW_TRG.xml | 8 +- src-db/database/sourcedata/AD_MODEL_OBJECT.xml | 20 +- src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml | 22 +- src-db/database/sourcedata/AD_TREENODE.xml | 176 +++++----- src/org/openbravo/erpCommon/utility/Menu_data.xsql | 26 +- 8 files changed, 140 insertions(+), 395 deletions(-) diffs (truncated from 1423 to 300 lines): diff -r f1fdf9f135a4 -r 213c0378d57f modules/org.openbravo.v3/src-db/database/configScript.xml --- a/modules/org.openbravo.v3/src-db/database/configScript.xml Fri Dec 24 10:49:39 2010 +0100 +++ b/modules/org.openbravo.v3/src-db/database/configScript.xml Fri Dec 24 11:21:00 2010 +0100 @@ -76,138 +76,30 @@ <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> </columnDataChange> - <columnDataChange tablename="AD_MENU" columnname="ISACTIVE" pkRow="171"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> <columnDataChange tablename="AD_MENU" columnname="ISACTIVE" pkRow="224"> <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> </columnDataChange> - <columnDataChange tablename="AD_MENU" columnname="ISACTIVE" pkRow="234"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_MENU" columnname="ISACTIVE" pkRow="240"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_MENU" columnname="ISACTIVE" pkRow="241"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> <columnDataChange tablename="AD_MENU" columnname="ISACTIVE" pkRow="261"> <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> </columnDataChange> - <columnDataChange tablename="AD_MENU" columnname="ISACTIVE" pkRow="800010"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_MENU" columnname="ISACTIVE" pkRow="800011"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_MENU" columnname="ISACTIVE" pkRow="800027"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_MENU" columnname="ISACTIVE" pkRow="800029"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_MENU" columnname="ISACTIVE" pkRow="800033"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_MENU" columnname="ISACTIVE" pkRow="800087"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_MENU" columnname="ISACTIVE" pkRow="800093"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_MENU" columnname="ISACTIVE" pkRow="800097"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> <columnDataChange tablename="AD_MENU" columnname="ISACTIVE" pkRow="800108"> <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> </columnDataChange> - <columnDataChange tablename="AD_MENU" columnname="ISACTIVE" pkRow="800181"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_MENU" columnname="ISACTIVE" pkRow="800193"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_MENU" columnname="ISACTIVE" pkRow="800195"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> <columnDataChange tablename="AD_MENU" columnname="ISACTIVE" pkRow="800196"> <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> </columnDataChange> - <columnDataChange tablename="AD_MENU" columnname="ISACTIVE" pkRow="800207"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_MENU" columnname="ISACTIVE" pkRow="800289"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_MENU" columnname="ISACTIVE" pkRow="800290"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> <columnDataChange tablename="AD_MENU" columnname="ISACTIVE" pkRow="1000001"> <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> </columnDataChange> - <columnDataChange tablename="AD_MENU" columnname="ISACTIVE" pkRow="1002100006"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_MENU" columnname="ISACTIVE" pkRow="1005400002"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_MENU" columnname="ISACTIVE" pkRow="1005500000"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> <columnDataChange tablename="AD_PREFERENCE" columnname="VALUE" pkRow="C085B29F345B423F9E7DE5677359E02B"> <oldValue><![CDATA[http://www.openbravo.com/myobrc2/widgets.html]]></oldValue> <newValue><![CDATA[http://www.openbravo.com/myobrc2/widgets.html ]]></newValue> </columnDataChange> - <columnDataChange tablename="AD_MODEL_OBJECT" columnname="ISACTIVE" pkRow="801952"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_MODEL_OBJECT_MAPPING" columnname="ISACTIVE" pkRow="803637"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_MODEL_OBJECT_MAPPING" columnname="ISACTIVE" pkRow="803644"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_MODEL_OBJECT_MAPPING" columnname="ISACTIVE" pkRow="803645"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_MODEL_OBJECT_MAPPING" columnname="ISACTIVE" pkRow="803646"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_MODEL_OBJECT_MAPPING" columnname="ISACTIVE" pkRow="803647"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> <columnDataChange tablename="AD_COLUMN" columnname="DEFAULTVALUE" pkRow="789"> <oldValue><![cda...@ad_client_id@]]></oldValue> <newValue><![cda...@#ad_client_id@]]></newValue> @@ -3376,118 +3268,6 @@ <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A1F24D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A2144D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A2244D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A24D4D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A2554D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A2594D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A25A4D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A2624D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A2B84D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A2B94D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A2C14D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A2C34D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A2C74D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A2EC4D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A2F24D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A2F54D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A2FD4D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A31F4D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A32A4D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A32C4D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A32D4D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A3384D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A3764D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A3774D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A3784D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A3DF4D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A3E74D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> - <columnDataChange tablename="AD_TREENODE" columnname="ISACTIVE" pkRow="52118BF1A3E84D84E040007F01005FEC"> - <oldValue><![CDATA[Y]]></oldValue> - <newValue><![CDATA[N]]></newValue> - </columnDataChange> <columnDataChange tablename="AD_FORM" columnname="ISACTIVE" pkRow="800013"> <oldValue><![CDATA[Y]]></oldValue> <newValue><![CDATA[N]]></newValue> diff -r f1fdf9f135a4 -r 213c0378d57f src-db/database/model/triggers/AD_FORM_TRG2.xml --- a/src-db/database/model/triggers/AD_FORM_TRG2.xml Fri Dec 24 10:49:39 2010 +0100 +++ b/src-db/database/model/triggers/AD_FORM_TRG2.xml Fri Dec 24 11:21:00 2010 +0100 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <database name="TRIGGER AD_FORM_TRG2"> - <trigger name="AD_FORM_TRG2" table="AD_FORM" fires="after" insert="true" update="true" delete="true" foreach="row"> + <trigger name="AD_FORM_TRG2" table="AD_FORM" fires="after" insert="true" update="false" delete="true" foreach="row"> <body><![CDATA[ @@ -18,7 +18,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) 2001-2009 Openbravo SLU +* All portions are Copyright (C) 2001-2010 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************/ @@ -31,30 +31,6 @@ IF AD_isTriggerEnabled()='N' THEN RETURN; END IF; - - IF(UPDATING) THEN - IF NOT(COALESCE(:old.NAME, '.') <> COALESCE(:NEW.NAME, '.') - OR COALESCE(:old.IsActive, '.') <> COALESCE(:NEW.IsActive, '.') - OR COALESCE(:old.CLASSNAME, '.') <> COALESCE(:NEW.CLASSNAME, '.')) - THEN - RETURN; - END IF; - END IF; - IF (UPDATING) THEN - UPDATE AD_MODEL_OBJECT_MAPPING - SET ISACTIVE = :new.isactive - WHERE AD_MODEL_OBJECT_ID IN - ( - SELECT AD_MODEL_OBJECT_ID ------------------------------------------------------------------------------ Learn how Oracle Real Application Clusters (RAC) One Node allows customers to consolidate database storage, standardize their database environment, and, should the need arise, upgrade to a full multi-node Oracle RAC database without downtime or disruption http://p.sf.net/sfu/oracle-sfdevnl _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits