pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[REF] website_form: adapt code after jQuery update

Browse Source 
Part of task 1896658

Co-authored-by: Aaron Bohy <aab@odoo.com>
Co-authored-by: Christophe Matthieu <chm@odoo.com>
Co-authored-by: Mathieu Duckerts-Antoine <dam@odoo.com>
Co-authored-by: David Monjoie <dmo@odoo.com>
Co-authored-by: Martin Geubelle <mge@odoo.com>
Co-authored-by: svs-odoo <svs@odoo.com>
Co-authored-by: Vincent Schippefilt <vsc@odoo.com>
This commit is contained in:
Vincent Schippefilt
2019-03-06 20:07:17 +01:00
committed by Aaron Bohy
co-authored by Aaron Bohy Christophe Matthieu Mathieu Duckerts-Antoine David Monjoie Martin Geubelle svs-odoo
parent a8e8184048
commit f7917b1502
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website_form/static/src/js/website_form.js
+6 -6
View File
@@ -13,11 +13,11 @@ odoo.define('website_form.animation', function (require) {
selector: '.s_website_form',
willStart: function () {
var def;
var prom;
if (!$.fn.datetimepicker) {
def = ajax.loadJS("/web/static/lib/tempusdominus/tempusdominus.js");
prom = ajax.loadJS("/web/static/lib/tempusdominus/tempusdominus.js");
}
return $.when(this._super.apply(this, arguments), def);
return Promise.all([this._super.apply(this, arguments), prom]);
},
start: function (editable_mode) {
@@ -117,7 +117,7 @@ odoo.define('website_form.animation', function (require) {
// Post form and handle result
ajax.post(this.$target.attr('action') + (this.$target.data('force_action')||this.$target.data('model_name')), form_values)
.then(function (result_data) {
result_data = $.parseJSON(result_data);
result_data = JSON.parse(result_data);
if (!result_data.id) {
// Failure, the server didn't return the created record ID
self.update_status('error');
@@ -139,7 +139,7 @@ odoo.define('website_form.animation', function (require) {
self.$target[0].reset();
}
})
.fail(function (result_data){
.guardedCatch(function (){
self.update_status('error');
});
},
@@ -238,7 +238,7 @@ odoo.define('website_form.animation', function (require) {
this.$target.find('.o_website_form_send').on('click',function (e) {self.send(e);}).removeClass('disabled');
}
var $result = this.$('#o_website_form_result');
this.templates_loaded.done(function () {
this.templates_loaded.then(function () {
$result.replaceWith(qweb.render("website_form.status_" + status));
});
},