[IMP] form change cancel button into discard link
bzr revid: al@openerp.com-20120419204418-mn8r1w624j4ba46o
This commit is contained in:
parent
8a66f58d52
commit
58483fcd65
|
@ -88,13 +88,12 @@ instance.web.FormView = instance.web.View.extend({
|
||||||
} else {
|
} else {
|
||||||
this.$element.find('.oe_form_buttons').replaceWith(this.$buttons);
|
this.$element.find('.oe_form_buttons').replaceWith(this.$buttons);
|
||||||
}
|
}
|
||||||
this.$buttons
|
this.$buttons.on('click','.oe_form_button_create',this.on_button_create);
|
||||||
.on('click','button.oe_form_button_save',this.on_button_save)
|
this.$buttons.on('click','.oe_form_button_edit',this.on_button_edit);
|
||||||
.on('click','button.oe_form_button_cancel',this.on_button_cancel)
|
this.$buttons.on('click','.oe_form_button_duplicate',this.on_button_duplicate);
|
||||||
.on('click','button.oe_form_button_edit',this.on_button_edit)
|
this.$buttons.on('click','.oe_form_button_delete',this.on_button_delete);
|
||||||
.on('click','button.oe_form_button_create',this.on_button_create)
|
this.$buttons.on('click','.oe_form_button_save',this.on_button_save);
|
||||||
.on('click','button.oe_form_button_duplicate',this.on_button_duplicate)
|
this.$buttons.on('click','.oe_form_button_cancel',this.on_button_cancel);
|
||||||
.on('click','button.oe_form_button_delete',this.on_button_delete);
|
|
||||||
|
|
||||||
this.$pager = $(QWeb.render("FormView.pager", {'widget':self}));
|
this.$pager = $(QWeb.render("FormView.pager", {'widget':self}));
|
||||||
if (this.options.$pager) {
|
if (this.options.$pager) {
|
||||||
|
@ -519,10 +518,11 @@ instance.web.FormView = instance.web.View.extend({
|
||||||
self.set({mode: "view"});
|
self.set({mode: "view"});
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
on_button_cancel: function() {
|
on_button_cancel: function(event) {
|
||||||
if (this.can_be_discarded()) {
|
if (this.can_be_discarded()) {
|
||||||
this.set({mode: "view"});
|
this.set({mode: "view"});
|
||||||
}
|
}
|
||||||
|
return false;
|
||||||
},
|
},
|
||||||
on_button_new: function() {
|
on_button_new: function() {
|
||||||
var self = this;
|
var self = this;
|
||||||
|
|
|
@ -715,8 +715,8 @@
|
||||||
<button type="button" class="oe_button oe_form_button_delete">Delete</button>
|
<button type="button" class="oe_button oe_form_button_delete">Delete</button>
|
||||||
</span>
|
</span>
|
||||||
<span class="oe_form_buttons_edit">
|
<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_save">Save</button> or
|
||||||
<button type="button" class="oe_button oe_form_button_cancel">Cancel</button>
|
<a href="#" class="oe_form_button_cancel">Discard</a>
|
||||||
</span>
|
</span>
|
||||||
</t>
|
</t>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue