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

[FIX] web: M2ODialog, adaptation to new Dialog API

Browse Source 
(backport from the enterprise version)
The M2ODialog still used the old Dialog API.
This commit is contained in:
qsm-odoo
2015-08-21 14:31:11 +02:00
parent 2a3f359ae8
commit 99faa6addd
2 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/js/views/form_relational_widgets.js
+19 -20
View File
@@ -26,30 +26,29 @@ var M2ODialog = Dialog.extend({
this._super(parent, {
title: _.str.sprintf(_t("Create a %s"), parent.string),
size: 'medium',
buttons: [
{text: _t('Create'), classes: 'btn-primary', click: function() {
if (this.$("input").val() !== ''){
this.getParent()._quick_create(this.$("input").val());
this.close();
} else {
e.preventDefault();
this.$("input").focus();
}
}},
{text: _t('Create and edit'), classes: 'btn-primary', close: true, click: function() {
this.getParent()._search_create_popup("form", undefined, this.getParent()._create_context(this.$("input").val()));
}},
{text: _t('Cancel'), close: true}
]
});
},
start: function() {
var self = this;
var text = _.str.sprintf(_t("You are creating a new %s, are you sure it does not exist yet?"), self.name);
this.$("p").text( text );
this.$buttons.html(QWeb.render("M2ODialog.buttons"));
var text = _.str.sprintf(_t("You are creating a new %s, are you sure it does not exist yet?"), this.name);
this.$("p").text(text);
this.$("input").val(this.getParent().$input.val());
this.$buttons.find(".oe_form_m2o_qc_button").click(function(e){
if (self.$("input").val() !== ''){
self.getParent()._quick_create(self.$("input").val());
self.destroy();
} else{
e.preventDefault();
self.$("input").focus();
}
});
this.$buttons.find(".oe_form_m2o_sc_button").click(function(){
self.getParent()._search_create_popup("form", undefined, self.getParent()._create_context(self.$("input").val()));
self.destroy();
});
this.$buttons.find(".oe_form_m2o_cancel_button").click(function(){
self.destroy();
});
},
});
addons/web/static/src/xml/base.xml
-5
View File
@@ -1380,11 +1380,6 @@
Name: <input class="oe_form_m2o_input_name" type="text"/>
</div>
</t>
<t t-name="M2ODialog.buttons">
<button class="oe_form_m2o_qc_button btn btn-primary">Create</button>
<button class="oe_form_m2o_sc_button btn btn-default">Create and edit</button>
<button class="oe_form_m2o_cancel_button btn btn-default"><span>Cancel</span></button>
</t>
<t t-name="FieldMonetary" t-extend="FieldChar">
<t t-jquery="t:first" t-operation="before">
<t t-if="widget.get('currency_info') and widget.get('currency_info').position === 'before'">