details: /erp/devel/pi/rev/94deb07307c5
changeset: 10182:94deb07307c5
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Thu Jan 27 17:20:20 2011 +0100
summary: fixed issue 15210: 2.50..3.00 compat skin should be enabled by
default
diffstat:
src-db/database/build-create.xml | 16 +++++++++++++---
src/org/openbravo/base/secureApp/VariablesSecureApp.java | 4 ++--
2 files changed, 15 insertions(+), 5 deletions(-)
diffs (60 lines):
diff -r 6eefbd8d76eb -r 94deb07307c5 src-db/database/build-create.xml
--- a/src-db/database/build-create.xml Thu Jan 27 19:46:33 2011 +0100
+++ b/src-db/database/build-create.xml Thu Jan 27 17:20:20 2011 +0100
@@ -12,7 +12,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-2010 Openbravo SLU
+ * All portions are Copyright (C) 2001-2011 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -242,7 +242,13 @@
<transaction>
DELETE FROM AD_SYSTEM;
INSERT INTO AD_SYSTEM (AD_SYSTEM_ID, AD_CLIENT_ID, AD_ORG_ID,
ISACTIVE, CREATED, CREATEDBY, UPDATED, UPDATEDBY, NAME, TAD_RECORDRANGE,
TAD_RECORDRANGE_INFO, TAD_TRANSACTIONALRANGE, TAD_THEME)
- VALUES ('0', '0', '0', 'Y', NOW(), '0', NOW(), '0', '?', 20, 100,
1, 'Default');
+ VALUES ('0', '0', '0', 'Y', NOW(), '0', NOW(), '0', '?', 20, 100,
1,
+ (SELECT Value
+ FROM (SELECT Value
+ FROM AD_Ref_List
+ WHERE AD_Ref_List_ID IN ('800247',
'27F0D1235450423C814D3A0DCABA7D10')
+ ORDER BY (CASE WHEN Name ='Default' THEN 2 ELSE 1
END))
+ WHERE RowNum = 1));
DELETE FROM AD_SYSTEM_INFO;
INSERT INTO AD_SYSTEM_INFO(AD_SYSTEM_INFO_ID, AD_CLIENT_ID,
AD_ORG_ID, ISACTIVE, CREATED, CREATEDBY, UPDATED, UPDATEDBY, ANT_VERSION,
OB_INSTALLMODE, CODE_REVISION, MATURITY_UPDATE, MATURITY_SEARCH)
VALUES('0', '0', '0', 'Y', NOW(), '0', NOW(), '0', '${ant.version}',
'From Sources', SUBSTR('${code.revision}',1,60), '500', '500');
@@ -281,7 +287,11 @@
<transaction>
DELETE FROM AD_SYSTEM;
INSERT INTO AD_SYSTEM (AD_SYSTEM_ID, AD_CLIENT_ID, AD_ORG_ID,
ISACTIVE, CREATED, CREATEDBY, UPDATED, UPDATEDBY, NAME, TAD_RECORDRANGE,
TAD_RECORDRANGE_INFO, TAD_TRANSACTIONALRANGE, TAD_THEME)
- VALUES ('0', '0', '0', 'Y', NOW(), '0', NOW(), '0', '?', 20, 100, 1,
'Default');
+ VALUES ('0', '0', '0', 'Y', NOW(), '0', NOW(), '0', '?', 20, 100, 1,
+ (SELECT Value FROM AD_Ref_List
+ WHERE AD_Ref_List_ID in ('800247',
'27F0D1235450423C814D3A0DCABA7D10')
+ ORDER BY (CASE WHEN Name ='Default' THEN 2 ELSE 1 END)
+ LIMIT 1));
DELETE FROM AD_SYSTEM_INFO;
INSERT INTO AD_SYSTEM_INFO(AD_SYSTEM_INFO_ID, AD_CLIENT_ID,
AD_ORG_ID, ISACTIVE, CREATED, CREATEDBY, UPDATED, UPDATEDBY, ANT_VERSION,
OB_INSTALLMODE, CODE_REVISION, MATURITY_UPDATE, MATURITY_SEARCH)
VALUES('0', '0', '0', 'Y', NOW(), '0', NOW(), '0', '${ant.version}',
'From Sources', SUBSTR('${code.revision}',1,60), '500', '500');
diff -r 6eefbd8d76eb -r 94deb07307c5
src/org/openbravo/base/secureApp/VariablesSecureApp.java
--- a/src/org/openbravo/base/secureApp/VariablesSecureApp.java Thu Jan 27
19:46:33 2011 +0100
+++ b/src/org/openbravo/base/secureApp/VariablesSecureApp.java Thu Jan 27
17:20:20 2011 +0100
@@ -1,6 +1,6 @@
/*
************************************************************************************
- * Copyright (C) 2001-2006 Openbravo S.L.U.
+ * Copyright (C) 2001-2011 Openbravo S.L.U.
* Licensed under the Apache Software License version 2.0
* You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
distributed
@@ -224,7 +224,7 @@
}
} finally {
if (strTheme.isEmpty()) {
- strTheme = "ltr/Default";
+ strTheme =
"ltr/org.openbravo.userinterface.skin.250to300Comp/250to300Comp";
}
return strTheme;
}
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
