details: https://code.openbravo.com/erp/devel/pi/rev/b03d3a9855de
changeset: 15579:b03d3a9855de
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Feb 23 10:39:50 2012 +0100
summary: Related to issue 19689: It is not possible to change Role twice in a row
backout of changeset 90498bc4ff7c02237b924a535281d62c71fb4cf1
Rolled back lab js upgrade enabled delayed call to start application (will be removed in next backout)
details: https://code.openbravo.com/erp/devel/pi/rev/b194cbf057ea
changeset: 15580:b194cbf057ea
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Feb 23 10:41:17 2012 +0100
summary: Related to issue 19689: It is not possible to change Role twice in a row
backout of changeset 15539 e5b1fd6ab7c6
details: https://code.openbravo.com/erp/devel/pi/rev/4fa8d5807b3d
changeset: 15581:4fa8d5807b3d
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Feb 23 10:42:21 2012 +0100
summary: Related to issue 19689: It is not possible to change Role twice in a row
backout of changeset 683adf88f417
rolled back change:
Always use a unique url when reloading the page after role change to prevent caching
details: https://code.openbravo.com/erp/devel/pi/rev/72140abf1128
changeset: 15582:72140abf1128
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Feb 23 10:43:28 2012 +0100
summary: Related to issue 19689: It is not possible to change Role twice in a row
backout of changeset: 3565776dbdb7
Rolled back change:
Do the reload of the window in a separate thread independent of the isc call thread
details: https://code.openbravo.com/erp/devel/pi/rev/78cb8a8e844c
changeset: 15583:78cb8a8e844c
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Feb 23 10:45:12 2012 +0100
summary: Fixes issue 19689: It is not possible to change Role twice in a row
Backout of changeset: ff135d3be049
Rolled back change:
Change way the page is reloaded after a role change
details: https://code.openbravo.com/erp/devel/pi/rev/6a763944d9da
changeset: 15584:6a763944d9da
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Feb 23 11:04:29 2012 +0100
summary: Related to issue 19689: It is not possible to change Role twice in a row
backout of changeset 90498bc4ff7c02237b924a535281d62c71fb4cf1
Rolled back lab js upgrade enabled delayed call to start application (will be removed in next backout)
Z
details: https://code.openbravo.com/erp/devel/pi/rev/f5c9c1c1853b
changeset: 15585:f5c9c1c1853b
user: Martin Taal <martin.taal <at> openbravo.com>
date: Thu Feb 23 11:04:56 2012 +0100
summary: Merged heads
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-textarea.js | 7 +++++
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-user-profile-widget.js | 14 +---------
modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js | 14 ++++++++-
modules/org.openbravo.client.kernel/web/org.openbravo.client.kernel/js/LAB.min.js | 4 +-
modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_TEXTINTERFACES.xml | 11 +++++++
src/index.jsp | 9 +++++-
6 files changed, 41 insertions(+), 18 deletions(-)
diffs (142 lines):
diff -r 4c8ffe893d50 -r f5c9c1c1853b modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-textarea.js
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-textarea.js Thu Feb 23 09:29:23 2012 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-textarea.js Thu Feb 23 11:04:56 2012 +0100
@@ -28,6 +28,13 @@
selectOnFocus: false,
+ init: function () {
+ if (this.initStyle) {
+ this.initStyle();
+ }
+ this.Super('init', arguments);
+ },
+
isDisabled: function () {
var ret = this.Super('isDisabled', arguments);
if (ret && this.showDisabled) {
diff -r 4c8ffe893d50 -r f5c9c1c1853b modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-user-profile-widget.js
--- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-user-profile-widget.js Thu Feb 23 09:29:23 2012 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/navbar/ob-user-profile-widget.js Thu Feb 23 11:04:56 2012 +0100
@@ -303,8 +303,6 @@
OB.RemoteCallManager.call(this.widgetInstance.formActionHandler, this.getValues(), {
'command': 'save'
}, this.doSaveCallback);
- // hide ourselves
- isc.OBQuickRun.hide();
},
// and reload
@@ -313,15 +311,7 @@
// is handled as an exception is returned anyway
if (data.result === OB.Constants.SUCCESS) {
// reload the window to reflect the changed role etc.
-
- // commented line causes this:
- // https://issues.openbravo.com/view.php?id=19689
- // https://issues.openbravo.com/view.php?id=19659
- // window.location.href = OB.Utilities.getLocationUrlWithoutFragment();
- // do this in a separate thread
- setTimeout(function() {
- window.location.replace(OB.Utilities.getLocationUrlWithoutFragment());
- }, 100);
+ window.location.href = OB.Utilities.getLocationUrlWithoutFragment();
}
},
@@ -446,8 +436,6 @@
OB.RemoteCallManager.call(passwordForm.formActionHandler, passwordForm.getValues(), {
'command': 'changePwd'
}, passwordForm.doSaveCallback);
- // hide ourselves
- isc.OBQuickRun.hide();
},
// the callback displays an info dialog and then hides the form
diff -r 4c8ffe893d50 -r f5c9c1c1853b modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js
--- a/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js Thu Feb 23 09:29:23 2012 +0100
+++ b/modules/org.openbravo.client.application/web/org.openbravo.userinterface.smartclient/openbravo/skins/Default/org.openbravo.client.application/ob-form-styles.js Thu Feb 23 11:04:56 2012 +0100
@@ -11,7 +11,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) 2010-2011 Openbravo SLU
+ * All portions are Copyright (C) 2010-2012 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -68,7 +68,17 @@
isc.OBTextAreaItem.addProperties(isc.addProperties({}, OB.Styles.OBFormField.DefaultTextItem));
isc.OBTextAreaItem.addProperties({
- height: 66
+ initStyle: function () {
+ //To adapt the height this code is used because height: '*' doesn't work properly (conflicts with OBSectionItem).
+ var rowSpan = 1;
+ var singleRowHeight = this.getHeight();
+ var multipleRowHeight = singleRowHeight + 24; // 24px = title height + form item padding defined in CSS
+ if (this.rowSpan) {
+ rowSpan = this.rowSpan;
+ }
+ var newHeight = singleRowHeight + (rowSpan - 1) * multipleRowHeight;
+ this.setHeight(newHeight);
+ }
});
isc.OBSpinnerItem.addProperties(isc.addProperties({}, OB.Styles.OBFormField.DefaultTextItem));
diff -r 4c8ffe893d50 -r f5c9c1c1853b modules/org.openbravo.client.kernel/web/org.openbravo.client.kernel/js/LAB.min.js
--- a/modules/org.openbravo.client.kernel/web/org.openbravo.client.kernel/js/LAB.min.js Thu Feb 23 09:29:23 2012 +0100
+++ b/modules/org.openbravo.client.kernel/web/org.openbravo.client.kernel/js/LAB.min.js Thu Feb 23 11:04:56 2012 +0100
@@ -1,5 +1,5 @@
/*! LAB.js (LABjs :: Loading And Blocking JavaScript)
- v2.0.3 (c) Kyle Simpson
+ v1.2.0 (c) Kyle Simpson
MIT License
*/
-(function(o){var K=o.$LAB,y="UseLocalXHR",z="AlwaysPreserveOrder",u="AllowDuplicates",A="CacheBust",B="BasePath",C=/^[^?#]*\//.exec(location.href)[0],D=/^\w+\:\/\/\/?[^\/]+/.exec(C)[0],i=document.head||document.getElementsByTagName("head"),L=(o.opera&&Object.prototype.toString.call(o.opera)=="[object Opera]")||("MozAppearance"in document.documentElement.style),q=document.createElement("script"),E=typeof q.preload=="boolean",r=E||(q.readyState&&q.readyState=="uninitialized"),F=!r&&q.async===true,M=!r&&!F&&!L;function G(a){return Object.prototype.toString.call(a)=="[object Function]"}function H(a){return Object.prototype.toString.call(a)=="[object Array]"}function N(a,c){var b=/^\w+\:\/\//;if(/^\/\/\/?/.test(a)){a=location.protocol+a}else if(!b.test(a)&&a.charAt(0)!="/"){a=(c||"")+a}return b.test(a)?a:((a.charAt(0)=="/"?D:C)+a)}function s(a,c){for(var b in a){if(a.hasOwnProperty(b)){c[b]=a[b]}}return c}function O(a){var c=false;for(var b=0;b<a.scripts.length;b++){if(a.scripts[b].ready&&a.scripts[b].exec_trigger){c=true;a.scripts[b].exec_trigger();a.scripts[b].exec_trigger=null}}return c}function t(a,c,b,d){a.onload=a.onreadystatechange=function(){if((a.readyState&&a.readyState!="complete"&&a.readyState!="loaded")||c[b])return;a.onload=a.onreadystatechange=null;d()}}function I(a){a.ready=a.finished=true;for(var c=0;c<a.finished_listeners.length;c++){a.finished_listeners[c]()}a.ready_listeners=[];a.finished_listeners=[]}function P(d,f,e,g,h){setTimeout(function(){var a,c=f.real_src,b;if("item"in i){if(!i[0]){setTimeout(arguments.callee,25);return}i=i[0]}a=document.createElement("script");if(f.type)a.type=f.type;if(f.charset)a.charset=f.charset;if(h){if(r){e.elem=a;if(E){a.preload=true;a.onpreload=g}else{a.onreadystatechange=function(){if(a.readyState=="loaded")g()}}a.src=c}else if(h&&c.indexOf(D)==0&&d[y]){b=new XMLHttpRequest();b.onreadystatechange=function(){if(b.readyState==4){b.onreadystatechange=function(){};e.text=b.responseText+"\n//@ sourceURL="+c;g()}};b.open("GET",c);b.send()}else{a.type="text/cache-script";t(a,e,"ready",function(){i.removeChild(a);g()});a.src=c;i.insertBefore(a,i.firstChild)}}else if(F){a.async=false;t(a,e,"finished",g);a.src=c;i.insertBefore(a,i.firstChild)}else{t(a,e,"finished",g);a.src=c;i.insertBefore(a,i.firstChild)}},0)}function J(){var l={},Q=r||M,n=[],p={},m;l[y]=true;l[z]=false;l[u]=false;l[A]=false;l[B]="";function R(a,c,b){var d;function f(){if(d!=null){d=null;I(b)}}if(p[c.src].finished)return;if(!a[u])p[c.src].finished=true;d=b.elem||document.createElement("script");if(c.type)d.type=c.type;if(c.charset)d.charset=c.charset;t(d,b,"finished",f);if(b.elem){b.elem=null}else if(b.text){d.onload=d.onreadystatechange=null;d.text=b.text}else{d.src=c.real_src}i.insertBefore(d,i.firstChild);if(b.text){f()}}function S(c,b,d,f){var e,g,h=function(){b.ready_cb(b,function(){R(c,b,e)})},j=function(){b.finished_cb(b,d)};b.src=N(b.src,c[B]);b.real_src=b.src+(c[A]?((/\?.*$/.test(b.src)?"&_":"?_")+~~(Math.random()*1E9)+"="):"");if(!p[b.src])p[b.src]={items:[],finished:false};g=p[b.src].items;if(c[u]||g.length==0){e=g[g.length]={ready:false,finished:false,ready_listeners:[h],finished_listeners:[j]};P(c,b,e,((f)?function(){e.ready=true;for(var a=0;a<e.ready_listeners.length;a++){e.ready_listeners[a]()}e.ready_listeners=[]}:function(){I(e)}),f)}else{e=g[0];if(e.finished){j()}else{e.finished_listeners.push(j)}}}function v(){var e,g=s(l,{}),h=[],j=0,w=false,k;function T(a,c){a.ready=true;a.exec_trigger=c;x()}function U(a,c){a.ready=a.finished=true;a.exec_trigger=null;for(var b=0;b<c.scripts.length;b++){if(!c.scripts[b].finished)return}c.finished=true;x()}function x(){while(j<h.length){if(G(h[j])){try{h[j++]()}catch(err){}continue}else if(!h[j].finished){if(O(h[j]))continue;break}j++}if(j==h.length){w=false;k=false}}function V(){if(!k||!k.scripts){h.push(k={scripts:[],finished:true})}}e={script:function(){for(var f=0;f<arguments.length;f++){(function(a,c){var b;if(!H(a)){c=[a]}for(var d=0;d<c.length;d++){V();a=c[d];if(G(a))a=a();if(!a)continue;if(H(a)){b=[].slice.call(a);b.unshift(d,1);[].splice.apply(c,b);d--;continue}if(typeof a=="string")a={src:a};a=s(a,{ready:false,ready_cb:T,finished:false,finished_cb:U});k.finished=false;k.scripts.push(a);S(g,a,k,(Q&&w));w=true;if(g[z])e.wait()}})(arguments[f],arguments[f])}return e},wait:function(){if(arguments.length>0){for(var a=0;a<arguments.length;a++){h.push(arguments[a])}k=h[h.length-1]}else k=false;x();return e}};return{script:e.script,wait:e.wait,setOptions:function(a){s(a,g);return e}}}m={setGlobalDefaults:function(a){s(a,l);return m},setOptions:function(){return v().setOptions.apply(null,arguments)},script:function(){return v().script.apply(null,arguments)},wait:function(){return v().wait.apply(null,arguments)},queueScript:function(){n[n.length]={type:"script",args:[].slice.call(arguments)};return m},queueWait:function(){n[n.length]={type:"wait",args:[].slice.call(arguments)};return m},runQueue:function(){var a=m,c=n.length,b=c,d;for(;--b>=0;){d=n.shift();a=a[d.type].apply(null,d.args)}return a},noConflict:function(){o.$LAB=K;return m},sandbox:function(){return J()}};return m}o.$LAB=J();(function(a,c,b){if(document.readyState==null&&document[a]){document.readyState="loading";document[a](c,b=function(){document.removeEventListener(c,b,false);document.readyState="complete"},false)}})("addEventListener","DOMContentLoaded")})(this);
\ No newline at end of file
+(function(p){var q="string",w="head",L="body",M="script",u="readyState",j="preloaddone",x="loadtrigger",N="srcuri",E="preload",Z="complete",y="done",z="which",O="preserve",F="onreadystatechange",ba="onload",P="hasOwnProperty",bb="script/cache",Q="[object ",bw=Q+"Function]",bx=Q+"Array]",e=null,h=true,i=false,k=p.document,bc=p.location,bd=p.ActiveXObject,A=p.setTimeout,be=p.clearTimeout,R=function(a){return k.getElementsByTagName(a)},S=Object.prototype.toString,G=function(){},r={},T={},bf=/^[^?#]*\//.exec(bc.href)[0],bg=/^\w+\:\/\/\/?[^\/]+/.exec(bf)[0],by=R(M),bh=p.opera&&S.call(p.opera)==Q+"Opera]",bi=("MozAppearance"in k.documentElement.style),bj=(k.createElement(M).async===true),v={cache:!(bi||bh),order:bi||bh||bj,xhr:h,dupe:h,base:"",which:w};v[O]=i;v[E]=h;r[w]=k.head||R(w);r[L]=R(L);function B(a){return S.call(a)===bw}function U(a,b){var c=/^\w+\:\/\//,d;if(typeof a!=q)a="";if(typeof b!=q)b="";d=((/^\/\//.test(a))?bc.protocol:"")+a;d=(c.test(d)?"":b)+d;return((c.test(d)?"":(d.charAt(0)==="/"?bg:bf))+d)}function bz(a){return(U(a).indexOf(bg)===0)}function bA(a){var b,c=-1;while(b=by[++c]){if(typeof b.src==q&&a===U(b.src)&&b.type!==bb)return h}return i}function H(t,l){t=!(!t);if(l==e)l=v;var bk=i,C=t&&l[E],bl=C&&l.cache,I=C&&l.order,bm=C&&l.xhr,bB=l[O],bC=l.which,bD=l.base,bn=G,J=i,D,s=h,m={},K=[],V=e;C=bl||bm||I;function bo(a,b){if((a[u]&&a[u]!==Z&&a[u]!=="loaded")||b[y]){return i}a[ba]=a[F]=e;return h}function W(a,b,c){c=!(!c);if(!c&&!(bo(a,b)))return;b[y]=h;for(var d in m){if(m[P](d)&&!(m[d][y]))return}bk=h;bn()}function bp(a){if(B(a[x])){a[x]();a[x]=e}}function bE(a,b){if(!bo(a,b))return;b[j]=h;A(function(){r[b[z]].removeChild(a);bp(b)},0)}function bF(a,b){if(a[u]===4){a[F]=G;b[j]=h;A(function(){bp(b)},0)}}function X(b,c,d,g,f,n){var o=b[z];A(function(){if("item"in r[o]){if(!r[o][0]){A(arguments.callee,25);return}r[o]=r[o][0]}var a=k.createElement(M);if(typeof d==q)a.type=d;if(typeof g==q)a.charset=g;if(B(f)){a[ba]=a[F]=function(){f(a,b)};a.src=c;if(bj){a.async=i}}r[o].insertBefore(a,(o===w?r[o].firstChild:e));if(typeof n==q){a.text=n;W(a,b,h)}},0)}function bq(a,b,c,d){T[a[N]]=h;X(a,b,c,d,W)}function br(a,b,c,d){var g=arguments;if(s&&a[j]==e){a[j]=i;X(a,b,bb,d,bE)}else if(!s&&a[j]!=e&&!a[j]){a[x]=function(){br.apply(e,g)}}else if(!s){bq.apply(e,g)}}function bs(a,b,c,d){var g=arguments,f;if(s&&a[j]==e){a[j]=i;f=a.xhr=(bd?new bd("Microsoft.XMLHTTP"):new p.XMLHttpRequest());f[F]=function(){bF(f,a)};f.open("GET",b);f.send("")}else if(!s&&a[j]!=e&&!a[j]){a[x]=function(){bs.apply(e,g)}}else if(!s){T[a[N]]=h;X(a,b,c,d,e,a.xhr.responseText);a.xhr=e}}function bt(a){if(typeof a=="undefined"||!a)return;if(a.allowDup==e)a.allowDup=l.dupe;var b=a.src,c=a.type,d=a.charset,g=a.allowDup,f=U(b,bD),n,o=bz(f);if(typeof d!=q)d=e;g=!(!g);if(!g&&((T[f]!=e)||(s&&m[f])||bA(f))){if(m[f]!=e&&m[f][j]&&!m[f][y]&&o){W(e,m[f],h)}return}if(m[f]==e)m[f]={};n=m[f];if(n[z]==e)n[z]=bC;n[y]=i;n[N]=f;J=h;if(!I&&bm&&o)bs(n,f,c,d);else if(!I&&bl)br(n,f,c,d);else bq(n,f,c,d)}function Y(a){if(t&&!I)K.push(a);if(!t||C)a()}function bu(a){var b=[],c;for(c=-1;++c<a.length;){if(S.call(a[c])===bx)b=b.concat(bu(a[c]));else b[b.length]=a[c]}return b}D={script:function(){be(V);var a=bu(arguments),b=D,c;if(bB){for(c=-1;++c<a.length;){if(B(a[c]))a[c]=a[c]();if(c===0){Y(function(){bt((typeof a[0]==q)?{src:a[0]}:a[0])})}else b=b.script(a[c]);b=b.wait()}}else{for(c=-1;++c<a.length;){if(B(a[c]))a[c]=a[c]()}Y(function(){for(c=-1;++c<a.length;){bt((typeof a[c]==q)?{src:a[c]}:a[c])}})}V=A(function(){s=i},5);return b},wait:function(a){be(V);s=i;if(!B(a))a=G;var b=H(t||J,l),c=b.trigger,d=function(){try{a()}catch(err){}c()};delete b.trigger;var g=function(){if(J&&!bk)bn=d;else d()};if(t&&!J)K.push(g);else Y(g);return b}};if(t){D.trigger=function(){var a,b=-1;while(a=K[++b])a();K=[]}}else D.trigger=G;return D}function bv(a){var b,c={},d={"UseCachePreload":"cache","UseLocalXHR":"xhr","UsePreloading":E,"AlwaysPreserveOrder":O,"AllowDuplicates":"dupe"},g={"AppendTo":z,"BasePath":"base"};for(b in d)g[b]=d[b];c.order=!(!v.order);for(b in g){if(g[P](b)&&v[g[b]]!=e)c[g[b]]=(a[b]!=e)?a[b]:v[g[b]]}for(b in d){if(d[P](b))c[d[b]]=!(!c[d[b]])}if(!c[E])c.cache=c.order=c.xhr=i;c.which=(c.which===w||c.which===L)?c.which:w;return c}p.$LAB={setGlobalDefaults:function(a){v=bv(a)},setOptions:function(a){return H(i,bv(a))},script:function(){return H().script.apply(e,arguments)},wait:function(){return H().wait.apply(e,arguments)}};(function(a,b,c){if(k[u]==e&&k[a]){k[u]="loading";k[a](b,c=function(){k.removeEventListener(b,c,i);k[u]=Z},i)}})("addEventListener","DOMContentLoaded")})(window);
\ No newline at end of file
diff -r 4c8ffe893d50 -r f5c9c1c1853b modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_TEXTINTERFACES.xml
--- a/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Thu Feb 23 09:29:23 2012 +0100
+++ b/modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_TEXTINTERFACES.xml Thu Feb 23 11:04:56 2012 +0100
@@ -990,6 +990,17 @@
<!--E748B33C558747D39E79783EC4788B20--> <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
<!--E748B33C558747D39E79783EC4788B20--></AD_TEXTINTERFACES>
+<!--E8821FAD1F0548E191F19C25EA803222--><AD_TEXTINTERFACES>
+<!--E8821FAD1F0548E191F19C25EA803222--> <AD_TEXTINTERFACES_ID><![CDATA[E8821FAD1F0548E191F19C25EA803222]]></AD_TEXTINTERFACES_ID>
+<!--E8821FAD1F0548E191F19C25EA803222--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--E8821FAD1F0548E191F19C25EA803222--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--E8821FAD1F0548E191F19C25EA803222--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--E8821FAD1F0548E191F19C25EA803222--> <TEXT><![CDATA[Deposit/Withdraw Date]]></TEXT>
+<!--E8821FAD1F0548E191F19C25EA803222--> <FILENAME><![CDATA[/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReportExcel.jrxml]]></FILENAME>
+<!--E8821FAD1F0548E191F19C25EA803222--> <ISUSED><![CDATA[Y]]></ISUSED>
+<!--E8821FAD1F0548E191F19C25EA803222--> <AD_MODULE_ID><![CDATA[2A5EE903D7974AC298C0504FBC4501A7]]></AD_MODULE_ID>
+<!--E8821FAD1F0548E191F19C25EA803222--></AD_TEXTINTERFACES>
+
<!--F3ED5198D0DA4B25ABADE68A48905575--><AD_TEXTINTERFACES>
<!--F3ED5198D0DA4B25ABADE68A48905575--> <AD_TEXTINTERFACES_ID><![CDATA[F3ED5198D0DA4B25ABADE68A48905575]]></AD_TEXTINTERFACES_ID>
<!--F3ED5198D0DA4B25ABADE68A48905575--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r 4c8ffe893d50 -r f5c9c1c1853b src/index.jsp
--- a/src/index.jsp Thu Feb 23 09:29:23 2012 +0100
+++ b/src/index.jsp Thu Feb 23 11:04:56 2012 +0100
@@ -136,10 +136,17 @@
</div>
<!-- load the rest -->
<script type="text/javascript">
+$LAB.setGlobalDefaults({AppendTo: 'body'});
+
var isomorphicDir='./web/org.openbravo.userinterface.smartclient/isomorphic/';
// starts the application is called as the last statement in the StaticResources part
-function OBStartApplication() {
+function OBStartApplication(delayed) {
+ // call delayed to take it out of the loading call stack of lab.js
+ if (!delayed) {
+ setTimeout('OBStartApplication(true)', 100);
+ return;
+ }
OB.Layout.initialize();
OB.Layout.draw();
OB.Layout.ViewManager.createAddStartTab();
|
