diff options
| author | Fabien Meghazi <fme@openerp.com> | 2011-10-17 12:03:10 +0200 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2011-10-17 12:03:10 +0200 |
| commit | 8b1e88a47a5c566ad0ebb2e79f67b16d242a2bd2 (patch) | |
| tree | 73df56a752533c18ccd0e68fd2e78acca0e83602 /addons/web/static/src | |
| parent | 22da3764df3b51bfeeaf11ff68eb5d289fb69544 (diff) | |
[REM] Removed '& Edit' label in FormView's Save and Create buttons
bzr revid: fme@openerp.com-20111017100310-sxhudt74oi7eia10
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 7 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 65ce114fb4b..569ac4f72ff 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -102,7 +102,6 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView# }); this.$form_header.find('button.oe_form_button_save').click(this.do_save); - this.$form_header.find('button.oe_form_button_save_edit').click(this.do_save_edit); this.$form_header.find('button.oe_form_button_cancel').click(this.do_cancel); this.$form_header.find('button.oe_form_button_new').click(this.on_button_new); this.$form_header.find('button.oe_form_button_duplicate').click(this.on_button_duplicate); @@ -427,10 +426,6 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView# this.mutating_lock = this.mutating_lock.pipe(action, action); return this.mutating_lock; }, - do_save_edit: function() { - this.do_save(); - //this.switch_readonly(); Use promises - }, switch_readonly: function() { }, switch_editable: function() { @@ -1948,7 +1943,7 @@ openerp.web.form.FieldOne2Many = openerp.web.form.Field.extend({ controller.on_pager_action.add_first(function() { self.save_form_view(); }); - controller.$element.find(".oe_form_button_save_edit").hide(); + controller.$element.find(".oe_form_button_save").hide(); } else if (view_type == "graph") { self.reload_current_view() } diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 3f955789b11..a0aafead6fa 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -649,15 +649,10 @@ <t t-name="FormView"> <div class="oe_form_header"> <div class="oe_form_buttons" t-if="view.options.action_buttons !== false"> - <!--<button type="button" class="oe_form_button_save"> + <button type="button" class="oe_form_button_save"> <span class="oe_form_on_update">Save</span> <span class="oe_form_on_create">Create</span> - </button>--> - <button type="button" class="oe_form_button_save_edit"> - <span class="oe_form_on_update">Save & Edit</span> - <span class="oe_form_on_create">Create & Edit</span> </button> - <!--<button type="button" class="oe_form_button_cancel">Cancel</button>--> <button type="button" class="oe_form_button_new">New</button> <button type="button" class="oe_form_button_duplicate oe_form_on_update">Duplicate</button> <button type="button" class="oe_form_button_toggle">Readonly/Editable</button> |