Bhumi Thakkar (Open ERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-bug-967234-bth into lp:openerp-web.
Requested reviews:
OpenERP R&D Web Team (openerp-dev-web)
Related bugs:
Bug #967234 in OpenERP Web: "[Trunk] Cannot Create Custom Fields"
https://bugs.launchpad.net/openerp-web/+bug/967234
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-bug-967234-bth/+merge/106627
Hello,
Improve code for pass module in context,get value of field and architecture
in html format to parse in xml.
Thanks & Regards,
Bhumi Thakkar (BTH)
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-bug-967234-bth/+merge/106627
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-bug-967234-bth.
=== modified file 'addons/web/static/src/js/view_editor.js'
--- addons/web/static/src/js/view_editor.js 2012-05-10 10:35:13 +0000
+++ addons/web/static/src/js/view_editor.js 2012-05-21 13:13:21 +0000
@@ -630,11 +630,9 @@
insert = _.intersection(_.flatten(temp_obj.att_list),_.uniq(check_list));
if (insert.length == _.uniq(check_list).length ) {return xml_child;}
});
+ xml_arch = QWeb.load_xml(arch.arch);
}
- arch_to_pass = _.filter($(arch.arch), function (child) {
- return child.nodeType == 1;
- });
- return self.do_save_xml(arch_to_pass[0], obj[0].child_id[0],obj[0].child_id, move_direct, update_values,arch);
+ return self.do_save_xml(xml_arch.documentElement, obj[0].child_id[0],obj[0].child_id, move_direct, update_values,arch);
},
get_object_by_id: function(id, one_object, result) {
var self = this;
@@ -891,7 +889,7 @@
var value = _.detect(arch_val[0]['att_list'],function(res) {
return res instanceof Array? _.include(res, widget.name): false;
});
-
+
value = value instanceof Array ? value[1] : value;
self.edit_node_dialog.$element.find('table[id=rec_table]').append('<tr><td align="right">' + widget.string + ':</td>' + type_widget.render() + '</tr>');
type_widget.start();
@@ -983,14 +981,14 @@
self.add_node_dialog.$element.find('#new_field').click(function() {
model_data = new instance.web.DataSetSearch(self,'ir.model', null, null);
model_data.read_slice([], {domain: [['model','=', self.model]]}).then(function(result) {
- self.render_new_field(result[0].id);
+ self.render_new_field(result[0]);
});
});
},
- render_new_field :function(id){
+ render_new_field :function( result ) {
var self = this;
var action = {
- context: {'default_model_id': id, 'manual': true},
+ context: {'default_model_id': result.id, 'manual': true, 'module' : result.modules},
res_model: "ir.model.fields",
views: [[false, 'form']],
type: 'ir.actions.act_window',
@@ -1007,7 +1005,7 @@
});
controller.do_save.add_last(function(){
action_manager.destroy();
- var value =controller.fields.name.value;
+ var value =controller.fields.name.get('value');
self.add_node_dialog.$element.find('select[id=field_value]').append($("<option selected></option>").attr("value",value).text(value));
_.detect(self.add_widget,function(widget){
widget.name == "field_value"? widget.selection.push(value): false;
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
