Merge lp:~openerp-dev/openerp-web/7.0-remove-url-timestamps-fme into lp:openerp-web/7.0

Proposed by Fabien Meghazi (OpenERP)
Status: Merged
Merged at revision: 3810
Proposed branch: lp:~openerp-dev/openerp-web/7.0-remove-url-timestamps-fme
Merge into: lp:openerp-web/7.0
Diff against target: 17 lines (+1/-6)
1 file modified
addons/web/controllers/main.py (+1/-6)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/7.0-remove-url-timestamps-fme
Reviewer Review Type Date Requested Status
Xavier (Open ERP) (community) Approve
Review via email: mp+150774@code.launchpad.net

Description of the change

The chrome cache bug seems to be gone with newer versions.
Moreover, the cutting edge features of the webkit developper tools source panel
won't work if url changes upon reload.

To post a comment you must log in.
Revision history for this message
Xavier (Open ERP) (xmo-deactivatedaccount) wrote :

No problem for me, I don't use Chrome and that thing's always been there to fix chrome caching bugs.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'addons/web/controllers/main.py'
--- addons/web/controllers/main.py 2013-02-07 17:34:39 +0000
+++ addons/web/controllers/main.py 2013-02-27 12:28:21 +0000
@@ -300,12 +300,7 @@
300 path += '?' + urllib.urlencode({'db': db})300 path += '?' + urllib.urlencode({'db': db})
301 return [path]301 return [path]
302 files = manifest_glob(req, extension, addons=mods, db=db)302 files = manifest_glob(req, extension, addons=mods, db=db)
303 i_am_diabetic = req.httprequest.environ["QUERY_STRING"].count("no_sugar") >= 1 or \303 return [wp for _fp, wp in files]
304 req.httprequest.environ.get('HTTP_REFERER', '').count("no_sugar") >= 1
305 if i_am_diabetic:
306 return [wp for _fp, wp in files]
307 else:
308 return ['%s?debug=%s' % (wp, os.path.getmtime(fp)) for fp, wp in files]
309304
310def get_last_modified(files):305def get_last_modified(files):
311 """ Returns the modification time of the most recently modified306 """ Returns the modification time of the most recently modified