diff options
| author | niv-openerp <nicolas.vanhoren@openerp.com> | 2013-06-10 17:45:14 +0200 |
|---|---|---|
| committer | niv-openerp <nicolas.vanhoren@openerp.com> | 2013-06-10 17:45:14 +0200 |
| commit | a94bbf8e5e3aafb236a059f82b855d16dc033d9e (patch) | |
| tree | 0b3f2cfa795a23150a10d561996052a023fd48f5 /addons/web/static/src/js/corelib.js | |
| parent | 901ba0cba5ea8413ea5cb64974ce8fc973093105 (diff) | |
| parent | 02aa3f211471a55fd956027a84b6baca1272ffa1 (diff) | |
[FIX] Merge fix in saas1 for the problem that made the server crash when install a db
bzr revid: nicolas.vanhoren@openerp.com-20130610144915-0nj8vpk7n84ocj3f
bzr revid: nicolas.vanhoren@openerp.com-20130610150657-3xddn91gm0iq0ubp
bzr revid: nicolas.vanhoren@openerp.com-20130610154514-oee6s4f9g17bx63z
Diffstat (limited to 'addons/web/static/src/js/corelib.js')
| -rw-r--r-- | addons/web/static/src/js/corelib.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js index c4bb81117f8..116ddf2e8c2 100644 --- a/addons/web/static/src/js/corelib.js +++ b/addons/web/static/src/js/corelib.js @@ -1144,7 +1144,8 @@ instance.web.JsonRPC = instance.web.Class.extend(instance.web.PropertiesMixin, { } qs = '?' + $.param(params); } - return this.prefix + path + qs; + var prefix = _.any(['http://', 'https://', '//'], _.bind(_.str.startsWith, null, path)) ? '' : this.prefix; + return prefix + path + qs; }, }); |