Vidhin Mehta (OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/Manage_view-vme into
lp:~openerp-dev/openerp-web/web-view-editor-jra.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/Manage_view-vme/+merge/92415
Implement inherited view functionality and reload view after closing.
--
https://code.launchpad.net/~openerp-dev/openerp-web/Manage_view-vme/+merge/92415
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openerp-web/Manage_view-vme into
lp:~openerp-dev/openerp-web/web-view-editor-jra.
=== modified file 'addons/web/static/src/js/view_editor.js'
--- addons/web/static/src/js/view_editor.js 2012-02-02 11:34:56 +0000
+++ addons/web/static/src/js/view_editor.js 2012-02-10 05:59:18 +0000
@@ -46,9 +46,10 @@
{text: _t("Create"), click: function() { self.on_create_view(); }},
{text: _t("Edit"), click: function() { self.xml_element_id = 0; self.get_arch(); }},
{text: _t("Remove"), click: function() { self.do_delete_view(); }},
- {text: _t("Close"), click: function() { self.view_edit_dialog.close(); }}
+ {text: _t("Close"), click: function() { self.view_edit_dialog.close(); window.location.reload(); }}
]
}).open();
+ this.view_edit_dialog.on_close.add_last(function(){window.location.reload();});
this.main_view_id = this.parent.fields_view.view_id;
this.action_manager = new openerp.web.ActionManager(this);
this.action_manager.appendTo(this.view_edit_dialog);
@@ -163,11 +164,12 @@
}
},
do_delete_view: function() {
+ var self = this;
if (confirm(_t("Do you really want to remove this view?"))) {
var controller = this.action_manager.inner_viewmanager.views[this.action_manager.inner_viewmanager.active_view].controller;
this.dataset.unlink([this.main_view_id]).then(function() {
controller.reload_content();
- this.main_view_id = self.parent.fields_view.view_id;
+ self.main_view_id = self.parent.fields_view.view_id;
});
}
},
@@ -304,7 +306,7 @@
case 3:
//for field[@name='type']
obj = _.detect(arch_object, function(element){
- if ((_.intersection(_.flatten(element.att_list), _.uniq(check))).length == check.length) {
+ if ((_.intersection(_.flatten(element.att_list), _.uniq(check))).length == _.uniq(check).length) {
return element;
}
});
@@ -362,6 +364,21 @@
title: _.str.sprintf(_t("View Editor %d - %s"), self.main_view_id, self.model),
height: '90%',
buttons: [
+ {text: _t("Inherit View"), click: function(){
+ var selected_row = self.edit_xml_dialog.$element.find('.ui-selected');
+ if (selected_row.length) {
+ if(selected_row.find('a').text().search("field") != -1){
+ if (confirm(_t("Do you really wants to create an inherited view here?"))) {
+ self.action_manager.inner_viewmanager.views[self.action_manager.inner_viewmanager.active_view].controller.reload_content();
+ self.inherited_view(selected_row);
+ }
+ }else{
+ alert("Can't Update View");
+ }
+ }else{
+ alert("Select an element");
+ }
+ }},
{text: _t("Preview"), click: function() {
var action = {
context: self.session.user_context,
@@ -399,6 +416,47 @@
self.on_select_img(this);
});
},
+ inherited_view: function(selected_row){
+ var self = this,row_id = parseInt((selected_row.attr('id')).split('-')[1]);
+ var obj = self.get_object_by_id(row_id,self.one_object['main_object'], [])[0];
+ var view_name = this.model + '.inherit_' + Math.round(Math.random() * 1000),
+ view_find = selected_row,view_id,min_level = parseInt(selected_row.attr('level'));
+ while (1) {
+ view_find = view_find.prev();
+ if (view_find.length == 0 ||
+ (self.edit_xml_dialog.$element.find(view_find).find('a').text()).search("view_id") != -1
+ && parseInt(view_find.attr('level')) < min_level ) {
+ view_id = parseInt(($(view_find).find('a').text()).replace(/[^0-9]+/g, ''));
+ break;
+ }
+ if (view_find.attr('level') < min_level) {min_level = parseInt(view_find.attr('level'));}
+ }
+ val = _.detect(obj.att_list,function(val){return val[0] == "name";});
+ var arch = _.str.sprintf("<?xml version='1.0'?>\n\t <field name='%s' position='after'> </field>", val[1]);
+ var vals = {'model': self.model, 'name': view_name, 'priority': 16, 'type': "form", 'arch': arch,'inherit_id':view_id};
+ this.dataset.create(vals, function(suc) {
+ var arch_to_obj = self.parse_xml(arch,suc.result);
+ self.one_object['parent_child_id'] = self.parent_child_list(self.one_object['main_object'],[]);
+ self.one_object['arch'].push({'view_id':suc.result,"arch":arch});
+ obj.child_id.push(arch_to_obj[0]);
+ self.increase_level(arch_to_obj[0],obj.level+1);
+ self.render_inherited_view(selected_row,arch_to_obj[0]);
+ });
+ },
+ render_inherited_view: function(selected_row,obj){
+ var self = this,row_id = parseInt((selected_row.attr('id')).split('-')[1]);
+ var clone = this.create_clone(selected_row.clone(),obj);
+ if (selected_row.find("img[id^='parentimg-']").length == 0) {
+ ($(selected_row.find('a').parent()).siblings('td'))
+ .append($('<img width="16" height="16"></img>').attr('src', '/web/static/src/img/collapse.gif').
+ attr('id','parentimg-'+ row_id).click(function(){
+ self.do_parent_img_hide_show(this);
+ }));
+ }
+ self.edit_xml_dialog.$element.
+ find("tr[id='viewedit-"+row_id+"']").after(clone.removeClass('ui-selected'));
+ _.each(obj.child_id,function(obj){self.render_inherited_view(clone,obj);});
+ },
on_select_img: function(element_img) {
var self = this;
var side = $(element_img).closest("tr[id^='viewedit-']");
@@ -564,7 +622,7 @@
arch.arch = _.detect(children, function(xml_child) {
var temp_obj = self.create_View_Node(xml_child),
insert = _.intersection(_.flatten(temp_obj.att_list),_.uniq(check_list));
- if (insert.length == check_list.length ) {return xml_child;}
+ if (insert.length == _.uniq(check_list).length ) {return xml_child;}
});
}
arch_to_pass = _.filter($(arch.arch), function (child) {
@@ -585,7 +643,7 @@
}
return result;
},
- create_clone: function(clone, new_node_obj, position){
+ create_clone: function(clone, new_node_obj){
var self = this;
clone.find('a').text(new_node_obj.name);
($(clone.find('a').parent()).siblings('td')).css( "padding-left", 20 * new_node_obj.level);
@@ -601,7 +659,8 @@
return clone;
},
do_save_xml: function(arch1, obj, child_list, move_direct, update_values, arch){
- var self = this, children_list = $(arch1).children(), list_obj_xml = _.zip(children_list, obj.child_id);
+ var self = this, children_list = $(arch1).children(),list_obj_xml;
+ try{list_obj_xml = _.zip(children_list, obj.child_id);}catch(err){return;}
if (this.one_object.clicked_tr_id) {
if (obj.id == this.one_object.clicked_tr_id) {
var parent = false, index = _.indexOf(child_list, obj);
_______________________________________________
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
