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

[imp] improved conception of rendering engine to make implementation of page view more logical and ease future implementation of editable list 

bzr revid: nicolas.vanhoren@openerp.com-20120320161806-nwkuygp82nngwlxw
This commit is contained in:
niv-openerp 2012-03-20 17:18:06 +01:00
parent c5a6bf8a2c
commit 80d3cf5ca8
2 changed files with 39 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,6 +50,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
this.on_change_mutex = new $.Mutex(); this.on_change_mutex = new $.Mutex();
this.reload_mutex = new $.Mutex(); this.reload_mutex = new $.Mutex();
this.set({"force_readonly": false}); this.set({"force_readonly": false});
this.rendering_engine = new openerp.web.FormRenderingEngine(this);
}, },
start: function() { start: function() {
this._super(); this._super();
@ -97,8 +98,8 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
this.fields_order = []; this.fields_order = [];
this.fields_view = data; this.fields_view = data;
var form = new openerp.web.FormRenderingEngine(this, data); this.rendering_engine.set_fields_view(data);
form.appendTo(this.$element.find('.oe_form_content')); this.rendering_engine.render_to(this.$element.find('.oe_form_content'));
this.$form_header = this.$element.find('.oe_form_header:first'); this.$form_header = this.$element.find('.oe_form_header:first');
this.$form_header.find('div.oe_form_pager button[data-pager-action]').click(function() { this.$form_header.find('div.oe_form_pager button[data-pager-action]').click(function() {
@ -725,24 +726,34 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
} }
}); });
openerp.web.FormRenderingEngine = openerp.web.Widget.extend({ /**
init: function(parent, fvg, registry) { * Default rendering engine for the form view.
this._super.apply(this, arguments); *
this.registry = registry; * It is necessary to set the view using set_view() before usage.
*/
openerp.web.FormRenderingEngine = openerp.web.Class.extend({
init: function(view) {
this.view = view;
},
set_fields_view: function(fvg) {
this.fvg = fvg; this.fvg = fvg;
this.view = parent; },
set_registry: function(registry) {
this.registry = registry;
},
render_to: function($element) {
var self = this;
this.$element = $element;
this.fields_prefix = this.view.dataset ? this.view.dataset.model : ''; this.fields_prefix = this.view.dataset ? this.view.dataset.model : '';
// TODO: I know this will save the world and all the kitten for a moment, // TODO: I know this will save the world and all the kitten for a moment,
// but one day, we will have to get rid of xml2json // but one day, we will have to get rid of xml2json
var xml = openerp.web.json_node_to_xml(fvg.arch); var xml = openerp.web.json_node_to_xml(this.fvg.arch);
this.$form = $(xml); this.$form = $(xml);
this.process(this.$form); this.process(this.$form);
},
start: function() {
var self = this;
this._super.apply(this, arguments);
this.$form.children().appendTo(this.$element); this.$form.children().appendTo(this.$element);
// OpenERP views spec : // OpenERP views spec :
// - @width is obsolete ? // - @width is obsolete ?
@ -754,11 +765,13 @@ openerp.web.FormRenderingEngine = openerp.web.Widget.extend({
if (self.view.registry.contains(key)) { if (self.view.registry.contains(key)) {
var obj = self.view.registry.get_object(key); var obj = self.view.registry.get_object(key);
var w = new (obj)(self.view, openerp.web.xml_to_json($elem[0])); var w = new (obj)(self.view, openerp.web.xml_to_json($elem[0]));
self.alter_field(w);
w.replace($elem); w.replace($elem);
} }
}); });
$('<button>Debug layout</button>').appendTo(this.$element).click(this.do_toggle_layout_debugging); $('<button>Debug layout</button>').appendTo(this.$element).click(this.do_toggle_layout_debugging);
}, },
alter_field: function(field) {},
do_toggle_layout_debugging: function() { do_toggle_layout_debugging: function() {
if (!this.$element.has('.oe_layout_debug_cell:first').length) { if (!this.$element.has('.oe_layout_debug_cell:first').length) {
this.$element.find('.oe_form_group_cell').each(function() { this.$element.find('.oe_form_group_cell').each(function() {
@ -1309,8 +1322,7 @@ openerp.web.form.WidgetButton = openerp.web.form.Widget.extend({
* able to provide the features necessary for the fields to work. * able to provide the features necessary for the fields to work.
* *
* Properties: * Properties:
* - force_readonly: boolean, When it is true, all the fields should always appear * - ...
* in read only mode, no matter what the value of their "readonly" property can be.
*/ */
openerp.web.form.FieldManagerInterface = { openerp.web.form.FieldManagerInterface = {
@ -1322,7 +1334,8 @@ openerp.web.form.FieldManagerInterface = {
* *
* Properties: * Properties:
* - readonly: boolean. If set to true the field should appear in readonly mode. * - readonly: boolean. If set to true the field should appear in readonly mode.
* * - force_readonly: boolean, When it is true, the field should always appear
* in read only mode, no matter what the value of the "readonly" property can be.
* Events: * Events:
* - ... * - ...
* *
@ -1402,10 +1415,10 @@ openerp.web.form.AbstractField = openerp.web.form.Widget.extend(/** @lends opene
// "force_readonly" // "force_readonly"
this.set({"readonly": this.modifiers['readonly'] === true}); this.set({"readonly": this.modifiers['readonly'] === true});
var test_effective_readonly = function() { var test_effective_readonly = function() {
this.set({"effective_readonly": this.get("readonly") || this.view.get("force_readonly")}); this.set({"effective_readonly": this.get("readonly") || this.get("force_readonly")});
}; };
this.on("change:readonly", this, test_effective_readonly); this.on("change:readonly", this, test_effective_readonly);
this.view.on("change:force_readonly", this, test_effective_readonly); this.on("change:force_readonly", this, test_effective_readonly);
_.bind(test_effective_readonly, this)(); _.bind(test_effective_readonly, this)();
if (this.view) { if (this.view) {

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

@ -6,9 +6,9 @@ openerp.web.page = function (openerp) {
openerp.web.PageView = openerp.web.FormView.extend({ openerp.web.PageView = openerp.web.FormView.extend({
template: "PageView", template: "PageView",
display_name: _lt('Page'), display_name: _lt('Page'),
init: function () { init: function() {
this._super.apply(this, arguments); this._super.apply(this, arguments);
this.set({"force_readonly": true}); this.rendering_engine = new openerp.web.FormRenderingEngineReadonly(this);
}, },
reload: function () { reload: function () {
if (this.dataset.index == null) { if (this.dataset.index == null) {
@ -64,4 +64,10 @@ openerp.web.page = function (openerp) {
} }
}); });
openerp.web.FormRenderingEngineReadonly = openerp.web.FormRenderingEngine.extend({
alter_field: function(field) {
field.set({"force_readonly": true});
},
});
}; };