diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-11-30 18:43:08 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-11-30 18:43:08 +0100 |
| commit | 42264d8dcb7f8d0795c84718d1fc9a5fd1aefd32 (patch) | |
| tree | 216ded7eac5ba06623892aaaece74c586afd4b5e /addons/website | |
| parent | e4a281b5a5f7ea44e4f25259b1a84cb0dc437ebc (diff) | |
| parent | 5d7ad2b16cc3ef579a6657822b7c57b07fef4f52 (diff) | |
[MERGE] forward port branch saas-16 up to 5d7ad2b16cc
Diffstat (limited to 'addons/website')
| -rw-r--r-- | addons/website/data/website_data.xml | 4 | ||||
| -rw-r--r-- | addons/website/models/res_partner.py | 2 | ||||
| -rw-r--r-- | addons/website/static/src/js/content/snippets.animation.js | 6 |
3 files changed, 8 insertions, 4 deletions
diff --git a/addons/website/data/website_data.xml b/addons/website/data/website_data.xml index dca66aff935..420abdf3e6f 100644 --- a/addons/website/data/website_data.xml +++ b/addons/website/data/website_data.xml @@ -221,7 +221,7 @@ <record id="website.library_image_02" model="ir.attachment"> <field name="public" eval="True"/> <field name="name">Website Library Image 02</field> - <field name="datas_fname">deliver.png</field> + <field name="datas_fname">deliver.jpg</field> <field name="res_model">ir.ui.view</field> <field name="type">url</field> <field name="url">/website/static/src/img/library/deliver.jpg</field> @@ -266,7 +266,7 @@ <record id="website.library_image_07" model="ir.attachment"> <field name="public" eval="True"/> <field name="name">Website Library Image 07</field> - <field name="datas_fname">mobile_device.png</field> + <field name="datas_fname">mobile_device.jpg</field> <field name="res_model">ir.ui.view</field> <field name="type">url</field> <field name="url">/website/static/src/img/library/mobile_device.jpg</field> diff --git a/addons/website/models/res_partner.py b/addons/website/models/res_partner.py index d0f4a76b199..d3a3b1bc9f9 100644 --- a/addons/website/models/res_partner.py +++ b/addons/website/models/res_partner.py @@ -21,7 +21,7 @@ class Partner(models.Model): return False params = { 'center': '%s, %s %s, %s' % (self.street or '', self.city or '', self.zip or '', self.country_id and self.country_id.name_get()[0][1] or ''), - 'size': "%sx%s" % (height, width), + 'size': "%sx%s" % (width, height), 'zoom': zoom, 'sensor': 'false', 'key': google_maps_api_key, diff --git a/addons/website/static/src/js/content/snippets.animation.js b/addons/website/static/src/js/content/snippets.animation.js index 725b6b1d66b..e5115ec7b18 100644 --- a/addons/website/static/src/js/content/snippets.animation.js +++ b/addons/website/static/src/js/content/snippets.animation.js @@ -590,7 +590,11 @@ registry.mediaVideo = Animation.extend({ * @override */ start: function () { - if (!this.$target.has('> iframe').length) { + // TODO: this code should be refactored to make more sense and be better + // integrated with Odoo (this refactoring should be done in master). + this.$target.find('iframe').remove(); + + if (!this.$target.has('.media_iframe_video_size').length) { var editor = '<div class="css_editableMode_display"> </div>'; var size = '<div class="media_iframe_video_size"> </div>'; this.$target.html(editor+size); |