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

[IMP]improvements to record load event. 

bzr revid: vme@tinyerp.com-20121009123532-bwlrg4ldtprd1w2d
This commit is contained in:
Vidhin Mehta (OpenERP) 2012-10-09 18:05:32 +05:30
parent 8888431f0d
commit abac1cae45
3 changed files with 8 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -380,7 +380,6 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
field._inhibit_on_change_flag = false;
set_values.push(result);
});
console.log("on_record_loaded");
return $.when.apply(null, set_values).pipe(function() {
if (!record.id) {
// New record: Second pass in order to trigger the onchanges
@ -755,7 +754,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM
this.trigger('history_back');
} else {
this.to_view_mode();
self.trigger('record_load',this.datarecord);
this.trigger('record_load',this.datarecord);
}
}
return false;

34
addons/web_diagram/static/src/js/diagram.js
View File

@ -239,24 +239,13 @@ instance.web.DiagramView = instance.web.View.extend({
title: _t("Open: ") + title
}
);
pop.on_write_completed.add(function() {
pop.on('on_write_complete', self, function() {
self.dataset.read_index(_.keys(self.fields_view.fields)).pipe(self.on_diagram_loaded);
});
var form_fields = [self.parent_field];
var form_controller = pop.view_form;
/*form_controller.on_record_loaded.add_first(function() {
console.log("web diagram add_first");
_.each(form_fields, function(fld) {
if (!(fld in form_controller.fields)) { return; }
var field = form_controller.fields[fld];
field.$input.prop('disabled', true);
field.$drop_down.unbind();
//field.$menu_btn.unbind();
});
});*/
form_controller.on("record_load", self, function(){
console.log("web diagram add_first");
_.each(form_fields, function(fld) {
@ -264,7 +253,6 @@ instance.web.DiagramView = instance.web.View.extend({
var field = form_controller.fields[fld];
field.$input.prop('disabled', true);
field.$drop_down.unbind();
//field.$menu_btn.unbind();
});
});
@ -293,14 +281,6 @@ instance.web.DiagramView = instance.web.View.extend({
var form_controller = pop.view_form;
var form_fields = [this.parent_field];
/*form_controller.on_record_loaded.add_last(function() {
_.each(form_fields, function(fld) {
if (!(fld in form_controller.fields)) { return; }
var field = form_controller.fields[fld];
field.set_value(self.id);
field.dirty = true;
});
});*/
form_controller.on("record_load", self, function(){
_.each(form_fields, function(fld) {
if (!(fld in form_controller.fields)) { return; }
@ -324,7 +304,7 @@ instance.web.DiagramView = instance.web.View.extend({
title: _t("Open: ") + title
}
);
pop.on_write.add(function() {
pop.on('on_write_complete', self, function() {
self.dataset.read_index(_.keys(self.fields_view.fields)).pipe(self.on_diagram_loaded);
});
},
@ -360,14 +340,8 @@ instance.web.DiagramView = instance.web.View.extend({
var form_controller = pop.view_form;
/*form_controller.on_record_loaded.add_last(function () {
form_controller.fields[self.connectors.attrs.source].set_value(node_source_id);
form_controller.fields[self.connectors.attrs.source].dirty = true;
form_controller.fields[self.connectors.attrs.destination].set_value(node_dest_id);
form_controller.fields[self.connectors.attrs.destination].dirty = true;
});*/
form_controller.on("record_load", self, function(){
console.log("add_connector");
form_controller.fields[self.connectors.attrs.source].set_value(node_source_id);
form_controller.fields[self.connectors.attrs.source].dirty = true;
form_controller.fields[self.connectors.attrs.destination].set_value(node_dest_id);

6
addons/web_tests/static/src/js/web_tests.js
View File

@ -23,14 +23,14 @@ openerp.web_tests = function (instance) {
on_everything_loaded: function (slice) {
var records = slice[0].records;
if (!records.length) {
this.form.on_record_loaded({});
this.form.trigger("record_load",{});
return;
}
this.form.on_record_loaded(records[0]);
this.form.trigger("record_load", records[0])
_(records.slice(1)).each(function (record, index) {
this.dataset.index = index+1;
this.form.reposition($('<div>').appendTo(this.$el));
this.form.on_record_loaded(record);
this.form.trigger("record_load", record)
}, this);
}
});