Merge lp:~therp-nl/ocb-web/6.1-lp1197783-file_upload_firefox_22 into lp:ocb-web/6.1
Proposed by
Stefan Rijnhart (Opener)
Status: | Merged |
---|---|
Merged at revision: | 2514 |
Proposed branch: | lp:~therp-nl/ocb-web/6.1-lp1197783-file_upload_firefox_22 |
Merge into: | lp:ocb-web/6.1 |
Diff against target: |
68 lines (+9/-6) 3 files modified
addons/web/controllers/main.py (+1/-1) addons/web/static/src/js/view_form.js (+2/-2) addons/web/static/src/xml/base.xml (+6/-3) |
To merge this branch: | bzr merge lp:~therp-nl/ocb-web/6.1-lp1197783-file_upload_firefox_22 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Holger Brunn (Therp) | code review | Approve | |
Review via email: mp+173042@code.launchpad.net |
Description of the change
Same as https:/
OpenERP 6.1 stores the callback function on the iframe that loads the code that calls the callback function. In Firefox 22, when the callback is called, it is no longer present on the iframe.
My suggestion in this branch is to use a seemingly unused input field that is already named 'callback'. In order to retrieve it from the iframe, I am assigning it an id.
Tested in Firefox 21, 22 and Chromium 28.0.1500.52
To post a comment you must log in.