diff options
| author | Fabien Meghazi <fme@openerp.com> | 2011-07-14 12:09:33 +0200 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2011-07-14 12:09:33 +0200 |
| commit | e32df7bb5d594cce1adb22e1cc9a951014f18d83 (patch) | |
| tree | 395ead6e9d1449e391f5926a84ab082d0604c4a2 /addons/base/static/src | |
| parent | 9d814c830b5e3146b939c986f70268cbd0ac169c (diff) | |
[ADD] Add a dialog function + xml view debug mode
bzr revid: fme@openerp.com-20110714100933-ce42j7ca2yzw0bsr
Diffstat (limited to 'addons/base/static/src')
| -rw-r--r-- | addons/base/static/src/js/form.js | 24 | ||||
| -rw-r--r-- | addons/base/static/src/xml/base.xml | 2 |
2 files changed, 21 insertions, 5 deletions
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index 701b4113bf4..0313c3d9ac0 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -79,6 +79,10 @@ openerp.base.FormView = openerp.base.View.extend( /** @lends openerp.base.FormV 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_get_xml_view').click(function() { + $('<xmp>' + openerp.base.json_node_to_xml(self.fields_view.arch, true) + '</xmp>').dialog({ width: '95%', height: 600}); + }); + this.view_manager.sidebar.set_toolbar(data.fields_view.toolbar); this.has_been_loaded.resolve(); }, @@ -1238,6 +1242,21 @@ openerp.base.form.FieldSelection = openerp.base.form.Field.extend({ }); })(); +openerp.base.form.dialog = function(content, options) { + options = _.extend({ + autoOpen: true, + width: '90%', + height: '90%', + min_width: '800px', + min_height: '600px' + }, options || {}); + options.autoOpen = true; + var dialog = new openerp.base.Dialog(null, options); + dialog.$dialog = $(content).dialog(dialog.options); + console.log(dialog.options) + return dialog.$dialog; +} + openerp.base.form.FieldMany2One = openerp.base.form.Field.extend({ init: function(view, node) { this._super(view, node); @@ -1826,10 +1845,7 @@ openerp.base.form.SelectCreatePopup = openerp.base.BaseWidget.extend({ this.context = context || {}; this.options = _.defaults(options || {}, {"initial_view": "search", "auto_create": true}); this.initial_ids = this.options.initial_ids; - jQuery(this.render()).dialog({title: '', - modal: true, - width: 960, - height: 600}); + openerp.base.form.dialog(this.render()); this.start(); }, start: function() { diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index ef0c1848f1e..8aa392a3fd1 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -334,8 +334,8 @@ <t t-raw="frame.render()"/> </t> <t t-name="FormView"> - <h2 class="oe_view_title"><t t-esc="view.fields_view.arch.attrs.string"/></h2> <div class="oe_form_header" t-att-id="view.element_id + '_header'"> + <h2 class="oe_view_title"><t t-esc="view.fields_view.arch.attrs.string"/> <button class="oe_get_xml_view">xml</button></h2> <div class="oe_form_buttons" t-if="view.flags.action_buttons !== false"> <!--<button type="button" class="oe_form_button_save"> <span class="oe_form_on_update">Save</span> |