[IMP] removed hack to force disable the browser's cache and use http headers instead
bzr revid: nicolas.vanhoren@openerp.com-20130724151929-8j1bo1ae64lwkxdw
This commit is contained in:
parent
a3f57cd43b
commit
b105770bbc
|
@ -557,7 +557,7 @@ class Home(http.Controller):
|
|||
'modules': simplejson.dumps(module_boot(db=db)),
|
||||
'init': 'var wc = new s.web.WebClient();wc.appendTo($(document.body));'
|
||||
}
|
||||
return r
|
||||
return request.make_response(r, {'Cache-Control': 'no-cache', 'Content-Type': 'text/html; charset=utf-8'})
|
||||
|
||||
@http.route('/login', type='http', auth="user")
|
||||
def login(self, db, login, key):
|
||||
|
|
|
@ -792,10 +792,17 @@ instance.web.redirect = function(url, wait) {
|
|||
instance.client.crashmanager.active = false;
|
||||
}
|
||||
|
||||
var wait_server = function() {
|
||||
instance.session.rpc("/web/webclient/version_info", {}).done(function() {
|
||||
var load = function() {
|
||||
var old = "" + window.location;
|
||||
if (old === url) {
|
||||
window.location.reload();
|
||||
} else {
|
||||
window.location = url;
|
||||
}).fail(function() {
|
||||
}
|
||||
};
|
||||
|
||||
var wait_server = function() {
|
||||
instance.session.rpc("/web/webclient/version_info", {}).done(load).fail(function() {
|
||||
setTimeout(wait_server, 250);
|
||||
});
|
||||
};
|
||||
|
@ -803,7 +810,7 @@ instance.web.redirect = function(url, wait) {
|
|||
if (wait) {
|
||||
setTimeout(wait_server, 1000);
|
||||
} else {
|
||||
window.location = url;
|
||||
load();
|
||||
}
|
||||
};
|
||||
|
||||
|
@ -818,7 +825,6 @@ instance.web.Reload = function(parent, action) {
|
|||
var l = window.location;
|
||||
|
||||
var sobj = $.deparam(l.search.substr(1));
|
||||
sobj.ts = new Date().getTime();
|
||||
if (params.url_search) {
|
||||
sobj = _.extend(sobj, params.url_search);
|
||||
}
|
||||
|
|
|
@ -459,7 +459,7 @@
|
|||
<tr>
|
||||
<td class="oe_leftbar" valign="top">
|
||||
<t t-set="debug" t-value="__debug__ ? '&debug' : ''"/>
|
||||
<a class="oe_logo" t-attf-href="/?ts=#{Date.now()}#{debug}">
|
||||
<a class="oe_logo" t-attf-href="/?#{debug}">
|
||||
<span class="oe_logo_edit">Edit Company data</span>
|
||||
<img t-att-src='widget.session.url("/web/binary/company_logo")'/>
|
||||
</a>
|
||||
|
|
Loading…
Reference in New Issue