diff options
| author | Christophe Simonis <chs@odoo.com> | 2014-10-21 14:59:56 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2014-10-21 14:59:56 +0200 |
| commit | a42167d085e8c4989412c39ec4e21685ebd93cd2 (patch) | |
| tree | fc8cf942fe689de94aec631d5b8d7365693de5d0 /addons/website | |
| parent | d822766296fed8f72d3168c675d4cf0b89e73f0c (diff) | |
| parent | 262eb662de489d98b76dece7305b594399161014 (diff) | |
[MERGE] forward port of branch 8.0 up to 262eb66
Diffstat (limited to 'addons/website')
| -rw-r--r-- | addons/website/models/ir_qweb.py | 3 | ||||
| -rw-r--r-- | addons/website/static/src/js/website.editor.js | 10 | ||||
| -rw-r--r-- | addons/website/views/snippets.xml | 4 |
3 files changed, 13 insertions, 4 deletions
diff --git a/addons/website/models/ir_qweb.py b/addons/website/models/ir_qweb.py index 7eba7c585be..019eedd3686 100644 --- a/addons/website/models/ir_qweb.py +++ b/addons/website/models/ir_qweb.py @@ -438,6 +438,9 @@ class Contact(orm.AbstractModel): _name = 'website.qweb.field.contact' _inherit = ['ir.qweb.field.contact', 'website.qweb.field.many2one'] + def from_html(self, cr, uid, model, column, element, context=None): + return None + class QwebView(orm.AbstractModel): _name = 'website.qweb.field.qweb' _inherit = ['ir.qweb.field.qweb'] diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index 4dda0ffbd35..6eb75694d03 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -1484,11 +1484,17 @@ this.changed($(e.target)); }, 'click button.filepicker': function () { - this.$('input[type=file]').click(); + var filepicker = this.$('input[type=file]'); + if (!_.isEmpty(filepicker)){ + filepicker[0].click(); + } }, 'click .js_disable_optimization': function () { this.$('input[name="disable_optimization"]').val('1'); - this.$('button.filepicker').click(); + var filepicker = this.$('button.filepicker'); + if (!_.isEmpty(filepicker)){ + filepicker[0].click(); + } }, 'change input[type=file]': 'file_selection', 'submit form': 'form_submit', diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml index 20db73d6388..f620a057c41 100644 --- a/addons/website/views/snippets.xml +++ b/addons/website/views/snippets.xml @@ -30,9 +30,9 @@ <a href="/page/website.contactus" class="btn btn-success btn-large">Contact us</a> </p> </div> - <span class="carousel-img col-md-6 hidden-sm hidden-xs"> + <div class="carousel-img col-md-6 hidden-sm hidden-xs"> <img class="img-responsive" src="/website/static/src/img/banner/banner_picture.png" alt="Banner Odoo Image"/> - </span> + </div> </div> </div> </div> |