diff options
| author | William Beltrán <wbeltran@infostudio.com.ec> | 2012-05-08 20:17:51 -0500 |
|---|---|---|
| committer | William Beltrán <wbeltran@infostudio.com.ec> | 2012-05-08 20:17:51 -0500 |
| commit | dfba540117d002b527b69dcd0a4ab33e3ed9bb49 (patch) | |
| tree | 7f4304e421c41ab8be7ab4a8932d3b6b2f562c5f /addons/web/static/src | |
| parent | 1e041011fd76d6318f2e6ed1e90fcb3dbec3ada7 (diff) | |
| parent | 8b4fce2e7101a005a6e7bc2c978675df2eee4c5b (diff) | |
i dont know
bzr revid: wbeltran@infostudio.com.ec-20120509011751-o5p2ujsoqyrkc1v2
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/boot.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/corelib.js | 4 | ||||
| -rw-r--r-- | addons/web/static/src/js/coresetup.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 5 |
4 files changed, 9 insertions, 4 deletions
diff --git a/addons/web/static/src/js/boot.js b/addons/web/static/src/js/boot.js index 29d953aadd8..f83dbc97095 100644 --- a/addons/web/static/src/js/boot.js +++ b/addons/web/static/src/js/boot.js @@ -37,7 +37,7 @@ }; openerp.instances[new_instance._session_id] = new_instance; for(var i=0; i < modules.length; i++) { - openerp[modules[i]](new_instance); + openerp[modules[i]](new_instance,new_instance[modules[i]]); } return new_instance; } diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js index 465ad2c921b..b30350a9502 100644 --- a/addons/web/static/src/js/corelib.js +++ b/addons/web/static/src/js/corelib.js @@ -1046,7 +1046,9 @@ instance.web.JsonRPC = instance.web.CallbackEnabled.extend({ '<li>Source: %(source)s</li>' + '</ul>'; try { - var ctx = this.test_eval_contexts(source.contexts); + // see Session.eval_context in Python + var ctx = this.test_eval_contexts( + ([this.context] || []).concat(source.contexts)); if (!_.isEqual(ctx, expected.context)) { instance.webclient.notification.warn('Context mismatch, report to xmo', _.str.sprintf(match_template, { diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js index e633ea9cfec..8f5f150f125 100644 --- a/addons/web/static/src/js/coresetup.js +++ b/addons/web/static/src/js/coresetup.js @@ -280,7 +280,7 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess instance[mod] = {}; // init module mod if(instance._openerp[mod] != undefined) { - instance._openerp[mod](instance); + instance._openerp[mod](instance,instance[mod]); this.module_loaded[mod] = true; } } diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 9f7071ae4f0..6c540fd6957 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -275,7 +275,10 @@ </tr> <tr> <td class="oe_leftbar" valign="top"> - <a href="#" class="oe_logo"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a> + <t t-js="d"> + d.url = '/' + (window.location.search || ''); + </t> + <a t-att-href="url" class="oe_logo"><img t-att-src='_s + "/web/static/src/img/logo.png"'/></a> <div class="oe_secondary_menus_container"/> <div class="oe_footer"> Powered by <a href="http://www.openerp.com"><span>Open</span>ERP</a> |