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

[IMP] form change cancel button into discard link 

bzr revid: al@openerp.com-20120419204418-mn8r1w624j4ba46o
This commit is contained in:
Antony Lesuisse 2012-04-19 22:44:18 +02:00
parent 8a66f58d52
commit 58483fcd65
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,13 +88,12 @@ instance.web.FormView = instance.web.View.extend({
} else {
this.$element.find('.oe_form_buttons').replaceWith(this.$buttons);
}
this.$buttons
.on('click','button.oe_form_button_save',this.on_button_save)
.on('click','button.oe_form_button_cancel',this.on_button_cancel)
.on('click','button.oe_form_button_edit',this.on_button_edit)
.on('click','button.oe_form_button_create',this.on_button_create)
.on('click','button.oe_form_button_duplicate',this.on_button_duplicate)
.on('click','button.oe_form_button_delete',this.on_button_delete);
this.$buttons.on('click','.oe_form_button_create',this.on_button_create);
this.$buttons.on('click','.oe_form_button_edit',this.on_button_edit);
this.$buttons.on('click','.oe_form_button_duplicate',this.on_button_duplicate);
this.$buttons.on('click','.oe_form_button_delete',this.on_button_delete);
this.$buttons.on('click','.oe_form_button_save',this.on_button_save);
this.$buttons.on('click','.oe_form_button_cancel',this.on_button_cancel);
this.$pager = $(QWeb.render("FormView.pager", {'widget':self}));
if (this.options.$pager) {
@ -519,10 +518,11 @@ instance.web.FormView = instance.web.View.extend({
self.set({mode: "view"});
});
},
on_button_cancel: function() {
on_button_cancel: function(event) {
if (this.can_be_discarded()) {
this.set({mode: "view"});
}
return false;
},
on_button_new: function() {
var self = this;

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

@ -715,8 +715,8 @@
<button type="button" class="oe_button oe_form_button_delete">Delete</button>
</span>
<span class="oe_form_buttons_edit">
<button type="button" class="oe_button oe_form_button_save">Save</button>
<button type="button" class="oe_button oe_form_button_cancel">Cancel</button>
<button type="button" class="oe_button oe_form_button_save">Save</button> or
<a href="#" class="oe_form_button_cancel">Discard</a>
</span>
</t>
</div>