odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] small "or" in some x2x popup 

bzr revid: nicolas.vanhoren@openerp.com-20120810145048-ctnvl0w5r5h439f7
This commit is contained in:
niv-openerp 2012-08-10 16:50:48 +02:00
parent c710e12517
commit c2caa24bd6
2 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/web/static/src/js/view_form.js
View File

@ -4165,7 +4165,10 @@ instance.web.form.AbstractFormPopup = instance.web.OldWidget.extend({
this.view_form.appendTo(this.$element.find(".oe_popup_form"));
this.view_form.on_loaded.add_last(function() {
var multi_select = self.row_id === null && ! self.options.disable_multiple_selection;
self.$buttonpane.html(QWeb.render("AbstractFormPopup.buttons", {multi_select: multi_select}));
self.$buttonpane.html(QWeb.render("AbstractFormPopup.buttons", {
multi_select: multi_select,
readonly: self.row_id !== null && self.options.readonly,
}));
var $snbutton = self.$buttonpane.find(".oe_abstractformpopup-form-save-new");
$snbutton.click(function() {
$.when(self.view_form.do_save()).then(function() {
@ -4186,11 +4189,6 @@ instance.web.form.AbstractFormPopup = instance.web.OldWidget.extend({
$cbutton.click(function() {
self.check_exit();
});
if (self.row_id !== null && self.options.readonly) {
$snbutton.hide();
$sbutton.hide();
$cbutton.text(_t("Close"));
}
self.view_form.do_show();
});
},

24
addons/web/static/src/xml/base.xml
View File

@ -1230,14 +1230,24 @@
<a class="oe_button oe_selectcreatepopup-search-close oe_bold oe_form_button_cancel" href="javascript:void(0)">Cancel</a>
</t>
<t t-name="AbstractFormPopup.buttons">
<t t-if="! multi_select">
<button type="button" class="oe_button oe_abstractformpopup-form-save oe_highlight">Save</button>
<t t-if="! readonly">
<t t-if="! multi_select">
<button type="button" class="oe_button oe_abstractformpopup-form-save oe_highlight">Save</button>
</t>
<t t-if="multi_select">
<button type="button" class="oe_button oe_abstractformpopup-form-save-new oe_highlight">Save &amp; New</button>
<button type="button" class="oe_button oe_abstractformpopup-form-save oe_highlight">Save &amp; Close</button>
</t>
or
</t>
<t t-if="multi_select">
<button type="button" class="oe_button oe_abstractformpopup-form-save-new oe_highlight">Save &amp; New</button>
<button type="button" class="oe_button oe_abstractformpopup-form-save oe_highlight">Save &amp; Close</button>
</t>
or <a class="oe_button oe_abstractformpopup-form-close oe_bold oe_form_button_cancel" href="javascript:void(0)">Discard</a>
<a class="oe_button oe_abstractformpopup-form-close oe_bold oe_form_button_cancel" href="javascript:void(0)">
<t t-if="! readonly">
Discard
</t>
<t t-if="readonly">
Close
</t>
</a>
</t>
<t t-name="One2Many.viewmanager" t-extend="ViewManager">