details: https://code.openbravo.com/erp/devel/pi/rev/3cf6eb447318 changeset: 15575:3cf6eb447318 user: Martin Taal <martin.taal <at> openbravo.com> date: Wed Feb 22 21:20:39 2012 +0100 summary: Related to issue 19689: It is not possible to change Role twice in a row Load the static resources in the head of the page
details: https://code.openbravo.com/erp/devel/pi/rev/4c8ffe893d50 changeset: 15576:4c8ffe893d50 user: Martin Taal <martin.taal <at> openbravo.com> date: Thu Feb 23 09:29:23 2012 +0100 summary: Merged heads diffstat: modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java | 6 +--- src-db/database/sourcedata/AD_MENU.xml | 2 +- src-db/database/sourcedata/AD_PROCESS.xml | 3 +- src-db/database/sourcedata/AD_TREENODE.xml | 12 +++++----- 4 files changed, 11 insertions(+), 12 deletions(-) diffs (112 lines): diff -r 848ac1c96c9b -r 4c8ffe893d50 modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java --- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java Wed Feb 22 21:16:50 2012 +0100 +++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/StaticResourceComponent.java Thu Feb 23 09:29:23 2012 +0100 @@ -46,7 +46,7 @@ private static final Logger log = Logger.getLogger(StaticResourceComponent.class); private static final String GEN_TARGET_LOCATION = "web/js/gen"; - private static final String JS_INCLUDE_FUNCTION = ";(function(){var a=document.createElement('script'),b=document.body||document.getElementsByTagName('@tag@')[0];a.type='text/javascript';a.src='@src@';b.appendChild(a);}());"; + private static final String JS_INCLUDE_FUNCTION = "(function(){var a=document.createElement('script'),b=document.head||document.getElementsByTagName('head')[0];a.type='text/javascript';a.src='@src@';b.appendChild(a);}());"; @Inject @Any @@ -114,8 +114,6 @@ final String scriptPath = getContextUrl() + GEN_TARGET_LOCATION + "/" + getStaticResourceFileName() + ".js"; - final String tagName = classicMode ? "head" : "body"; - if (classicMode) { result.append("document.write(\"<LINK rel='stylesheet' type='text/css' href='" + getContextUrl() @@ -125,7 +123,7 @@ result .append("var isomorphicDir='../web/org.openbravo.userinterface.smartclient/isomorphic/';\n"); } - result.append(JS_INCLUDE_FUNCTION.replace("@src@", scriptPath).replace("@tag@", tagName)); + result.append(JS_INCLUDE_FUNCTION.replace("@src@", scriptPath)); return result.toString(); } catch (Exception e) { log.error("Error generating component; " + e.getMessage(), e); diff -r 848ac1c96c9b -r 4c8ffe893d50 src-db/database/sourcedata/AD_MENU.xml --- a/src-db/database/sourcedata/AD_MENU.xml Wed Feb 22 21:16:50 2012 +0100 +++ b/src-db/database/sourcedata/AD_MENU.xml Thu Feb 23 09:29:23 2012 +0100 @@ -3995,7 +3995,7 @@ <!--800282--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--800282--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--800282--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--800282--> <NAME><![CDATA[Pending Production]]></NAME> +<!--800282--> <NAME><![CDATA[Stock for open orders]]></NAME> <!--800282--> <DESCRIPTION><![CDATA[Show the lines of the pending orders with the actual stock of each product.]]></DESCRIPTION> <!--800282--> <ISSUMMARY><![CDATA[N]]></ISSUMMARY> <!--800282--> <ACTION><![CDATA[R]]></ACTION> diff -r 848ac1c96c9b -r 4c8ffe893d50 src-db/database/sourcedata/AD_PROCESS.xml --- a/src-db/database/sourcedata/AD_PROCESS.xml Wed Feb 22 21:16:50 2012 +0100 +++ b/src-db/database/sourcedata/AD_PROCESS.xml Thu Feb 23 09:29:23 2012 +0100 @@ -4800,7 +4800,7 @@ <!--800198--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--800198--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--800198--> <VALUE><![CDATA[RV_ReportPendingProductionJr]]></VALUE> -<!--800198--> <NAME><![CDATA[Pending Production]]></NAME> +<!--800198--> <NAME><![CDATA[Stock for open orders]]></NAME> <!--800198--> <DESCRIPTION><![CDATA[Show the lines of the pending orders with the actual stock of each product.]]></DESCRIPTION> <!--800198--> <HELP><![CDATA[Show the lines of the pending orders with the actual stock of each product.]]></HELP> <!--800198--> <ACCESSLEVEL><![CDATA[3]]></ACCESSLEVEL> @@ -4809,6 +4809,7 @@ <!--800198--> <ISDIRECTPRINT><![CDATA[N]]></ISDIRECTPRINT> <!--800198--> <ISBACKGROUND><![CDATA[N]]></ISBACKGROUND> <!--800198--> <ISJASPER><![CDATA[N]]></ISJASPER> +<!--800198--> <ISEXTERNALSERVICE><![CDATA[N]]></ISEXTERNALSERVICE> <!--800198--> <AD_MODULE_ID><![CDATA[0]]></AD_MODULE_ID> <!--800198--> <UIPATTERN><![CDATA[M]]></UIPATTERN> <!--800198--> <ISADVANCEDFEATURE><![CDATA[N]]></ISADVANCEDFEATURE> diff -r 848ac1c96c9b -r 4c8ffe893d50 src-db/database/sourcedata/AD_TREENODE.xml --- a/src-db/database/sourcedata/AD_TREENODE.xml Wed Feb 22 21:16:50 2012 +0100 +++ b/src-db/database/sourcedata/AD_TREENODE.xml Thu Feb 23 09:29:23 2012 +0100 @@ -1756,7 +1756,7 @@ <!--52118BF1A2BA4D84E040007F01005FEC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--52118BF1A2BA4D84E040007F01005FEC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--52118BF1A2BA4D84E040007F01005FEC--> <PARENT_ID><![CDATA[800075]]></PARENT_ID> -<!--52118BF1A2BA4D84E040007F01005FEC--> <SEQNO><![CDATA[130]]></SEQNO> +<!--52118BF1A2BA4D84E040007F01005FEC--> <SEQNO><![CDATA[120]]></SEQNO> <!--52118BF1A2BA4D84E040007F01005FEC--></AD_TREENODE> <!--52118BF1A2BC4D84E040007F01005FEC--><AD_TREENODE> @@ -1844,7 +1844,7 @@ <!--52118BF1A2C54D84E040007F01005FEC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--52118BF1A2C54D84E040007F01005FEC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--52118BF1A2C54D84E040007F01005FEC--> <PARENT_ID><![CDATA[800075]]></PARENT_ID> -<!--52118BF1A2C54D84E040007F01005FEC--> <SEQNO><![CDATA[120]]></SEQNO> +<!--52118BF1A2C54D84E040007F01005FEC--> <SEQNO><![CDATA[114]]></SEQNO> <!--52118BF1A2C54D84E040007F01005FEC--></AD_TREENODE> <!--52118BF1A2C64D84E040007F01005FEC--><AD_TREENODE> @@ -2009,7 +2009,7 @@ <!--52118BF1A2DA4D84E040007F01005FEC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--52118BF1A2DA4D84E040007F01005FEC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--52118BF1A2DA4D84E040007F01005FEC--> <PARENT_ID><![CDATA[800075]]></PARENT_ID> -<!--52118BF1A2DA4D84E040007F01005FEC--> <SEQNO><![CDATA[100]]></SEQNO> +<!--52118BF1A2DA4D84E040007F01005FEC--> <SEQNO><![CDATA[102]]></SEQNO> <!--52118BF1A2DA4D84E040007F01005FEC--></AD_TREENODE> <!--52118BF1A2DB4D84E040007F01005FEC--><AD_TREENODE> @@ -3351,7 +3351,7 @@ <!--52118BF1A3674D84E040007F01005FEC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--52118BF1A3674D84E040007F01005FEC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--52118BF1A3674D84E040007F01005FEC--> <PARENT_ID><![CDATA[800075]]></PARENT_ID> -<!--52118BF1A3674D84E040007F01005FEC--> <SEQNO><![CDATA[110]]></SEQNO> +<!--52118BF1A3674D84E040007F01005FEC--> <SEQNO><![CDATA[108]]></SEQNO> <!--52118BF1A3674D84E040007F01005FEC--></AD_TREENODE> <!--52118BF1A3684D84E040007F01005FEC--><AD_TREENODE> @@ -3460,8 +3460,8 @@ <!--52118BF1A3724D84E040007F01005FEC--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> <!--52118BF1A3724D84E040007F01005FEC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--52118BF1A3724D84E040007F01005FEC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> -<!--52118BF1A3724D84E040007F01005FEC--> <PARENT_ID><![CDATA[800141]]></PARENT_ID> -<!--52118BF1A3724D84E040007F01005FEC--> <SEQNO><![CDATA[10]]></SEQNO> +<!--52118BF1A3724D84E040007F01005FEC--> <PARENT_ID><![CDATA[800075]]></PARENT_ID> +<!--52118BF1A3724D84E040007F01005FEC--> <SEQNO><![CDATA[96]]></SEQNO> <!--52118BF1A3724D84E040007F01005FEC--></AD_TREENODE> <!--52118BF1A3734D84E040007F01005FEC--><AD_TREENODE> ------------------------------------------------------------------------------ Virtualization & Cloud Management Using Capacity Planning Cloud computing makes use of virtualization - but cloud computing also focuses on allowing computing to be delivered as a service. http://www.accelacomm.com/jaw/sfnl/114/51521223/ _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
