diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 3b9071bec23..287aeca5224 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1428,6 +1428,14 @@ label.error { background: 1px 3px url(/web/static/src/img/icons/gtk-print.png) no-repeat; } +.openerp .oe-running-kitten { + display: none; +} + +.openerp.kitten-mode-activated .oe-running-kitten { + display: inherit; +} + .openerp.kitten-mode-activated .main_table { background: url(http://placekitten.com/g/1500/800) repeat; } diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 2b838ee3743..f10ee9376f6 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1114,7 +1114,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie this.action_manager.do_action(action); }, do_about: function() { - }, + } }); diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index 906ddefc6e5..d271fbc430e 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -509,16 +509,24 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp. var self = this; this.session_id = this.get_cookie('session_id'); return this.rpc("/web/session/get_session_info", {}).then(function(result) { + // If immediately follows a login (triggered by trying to restore + // an invalid session or no session at all), refresh session data + // (should not change, but just in case...) but should not call + // on_session_valid again as it triggers reloading the menu + var already_logged = self.uid; _.extend(self, { uid: result.uid, user_context: result.context, db: result.db, username: result.login }); - if (self.uid) - self.on_session_valid(); - else - self.on_session_invalid(); + if (!already_logged) { + if (self.uid) { + self.on_session_valid(); + } else { + self.on_session_invalid(); + } + } }, function() { self.on_session_invalid(); }); diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js index 0d3833ee835..1f2520ee774 100644 --- a/addons/web/static/src/js/data.js +++ b/addons/web/static/src/js/data.js @@ -826,7 +826,7 @@ openerp.web.Model = openerp.web.CallbackEnabled.extend({ var index = {}; _.each(_.range(result.length), function(i) { index[result[i]["id"]] = result[i]; - }) + }); result = _.map(args[0], function(x) {return index[x];}); } return result; @@ -843,7 +843,7 @@ openerp.web.Model = openerp.web.CallbackEnabled.extend({ context: context }).pipe(function(result) { return result.records; - });; + }); } }); diff --git a/addons/web/static/src/js/view_editor.js b/addons/web/static/src/js/view_editor.js index 71cda6fcc47..9f649b313df 100644 --- a/addons/web/static/src/js/view_editor.js +++ b/addons/web/static/src/js/view_editor.js @@ -1,13 +1,16 @@ openerp.web.view_editor = function(openerp) { +var _t = openerp.web._t; var QWeb = openerp.web.qweb; openerp.web.ViewEditor = openerp.web.Widget.extend({ init: function(parent, element_id, dataset, view, options) { this._super(parent); this.element_id = element_id this.parent = parent - this.dataset = dataset; + this.dataset = new openerp.web.DataSetSearch(this, 'ir.ui.view', null, null), this.model = dataset.model; - this.xml_id = 0; + this.xml_element_id = 0; + this.property = openerp.web.ViewEditor.property_widget; + this.one_object = false; }, start: function() { this.init_view_editor(); @@ -15,23 +18,24 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ init_view_editor: function() { var self = this; var action = { - name:'ViewEditor', - context:this.session.user_context, - domain: [["model", "=", this.dataset.model]], - res_model : 'ir.ui.view', - views : [[false, 'list']], + name: _.str.sprintf("Manage Views (%s)", this.model), + context: this.session.user_context, + domain: [["model", "=", this.model]], + res_model: 'ir.ui.view', + views: [[false, 'list']], type: 'ir.actions.act_window', target: "current", - limit : 80, - auto_search : true, + limit: this.dataset.limit || 80, + auto_search: true, flags: { sidebar: false, deletable: false, views_switcher: false, - action_buttons:false, - search_view:false, - pager:false, - radio: true + action_buttons: false, + search_view: false, + pager: false, + radio: true, + select_view_id: self.parent.fields_view.view_id }, }; this.view_edit_dialog = new openerp.web.Dialog(this, { @@ -41,207 +45,308 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ height: 500, buttons: { "Create": function(){ - //to do + self.on_create_view(); }, "Edit": function(){ - self.xml_id=0; - self.get_data(); + self.xml_element_id = 0; + self.get_arch(); + }, + "Remove": function(){ + self.do_delete_view(); }, "Close": function(){ self.view_edit_dialog.close(); } }, - }); - this.view_edit_dialog.start().open(); - var action_manager = new openerp.web.ActionManager(this); - action_manager.appendTo(this.view_edit_dialog); - action_manager.do_action(action); - }, - check_attr: function(xml, tag, level) { - var obj = {'child_id': [], 'id': this.xml_id++, 'level': level+1, 'att_list': [], 'name': ""}; - var render_name = "<" + tag; - obj.att_list.push(tag); - $(xml).each(function() { - _.each(this.attributes, function(attrs){ - if (tag != 'button') { - if (attrs.nodeName == "string" || attrs.nodeName == "name" || attrs.nodeName == "index") { - render_name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"' ; + }).start().open(); + 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); + $.when(this.action_manager.do_action(action)).then(function() { + var viewmanager = self.action_manager.inner_viewmanager, + controller = viewmanager.views[viewmanager.active_view].controller; + controller.on_loaded.add_last(function(){ + $(controller.groups).bind({ + 'selected': function(e, ids, records) { + self.main_view_id = ids[0]; } - } else { - if (attrs.nodeName == "name") { - render_name += ' ' + attrs.nodeName + '=' + '"' + attrs.nodeValue + '"'; - } - } - obj.att_list.push( [attrs.nodeName,attrs.nodeValue] ); + }) }); - render_name+= ">"; }); - obj.name = render_name; - return obj; }, - save_object: function(val, parent_list, child_obj_list) { + on_create_view: function() { var self = this; - var check_id = parent_list[0]; - var p_list = parent_list.slice(1); - if (val.child_id.length != 0) { - _.each(val.child_id, function(val, key) { - if (val.id == check_id) { - if (p_list.length!=0) { - self.save_object(val, p_list, child_obj_list); - } else { - val.child_id = child_obj_list; - return false; + this.create_view_dialog = new openerp.web.Dialog(this, { + modal: true, + title: _.str.sprintf("Create a view (%s)", self.model), + width: 500, + height: 400, + buttons: { + "Save": function(){ + var view_values = {}; + var warn = false; + _.each(self.create_view_widget, function(widget) { + if (widget.is_invalid) { + warn = true; + return false; + }; + if (widget.dirty && !widget.is_invalid) { + view_values[widget.name] = widget.get_value(); + } + }); + if (warn) { + self.on_valid_create_view(self.create_view_widget); + } else { + $.when(self.do_save_view(view_values)).then(function() { + self.create_view_dialog.close(); + var controller = self.action_manager.inner_viewmanager.views[self.action_manager.inner_viewmanager.active_view].controller; + controller.reload_content(); + }); + } + }, + "Cancel": function(){ + self.create_view_dialog.close(); } } + }); + this.create_view_dialog.start().open(); + var view_widget = [{'name': 'view_name', 'string':'View Name', 'type': 'char', 'required': true, 'value' : this.model + '.custom_' + Math.round(Math.random() * 1000)}, + {'name': 'view_type', 'string': 'View Type', 'type': 'selection', 'required': true, 'value': 'Form', 'selection': [['',''],['tree', 'Tree'],['form', 'Form'],['graph', 'Graph'],['calendar', 'Calender']]}, + {'name': 'proirity', 'string': 'Priority', 'type': 'float', 'required': true, 'value':'16'}]; + this.create_view_dialog.$element.append('
'); + this.create_view_widget = []; + _.each(view_widget, function(widget) { + var type_widget = new (self.property.get_any([widget.type])) (self.create_view_dialog, widget); + self.create_view_dialog.$element.find('table[id=create_view]').append('' + widget.string + ':' + type_widget.render()+''); + var value = null; + if (widget.value) { + value = widget.value; + type_widget.dirty = true; + } + type_widget.start(); + type_widget.set_value(value) + self.create_view_widget.push(type_widget); + }); + }, + do_save_view: function(values) { + def = $.Deferred(); + var field_dataset = new openerp.web.DataSetSearch(this, this.model, null, null); + var model_dataset = new openerp.web.DataSetSearch(this, 'ir.model', null, null); + var view_string = "", field_name = false, self = this; + field_dataset.call( 'fields_get', [], function(fields) { + _.each(['name', 'x_name'], function(value) { + if (_.include(_.keys(fields), value)) { + field_name = value; + return false; + } }); - } else { - val.child_id = child_obj_list; + if (field_name) { + model_dataset.read_slice(['name','field_id'], {"domain": [['model','=',self.model]]}, function(records) { + if (records) {view_string = records[0].name;} + var arch = _.str.sprintf("\n<%s string='%s'>\n\t\n", values.view_type, view_string, field_name, values.view_type); + var vals = {'model': self.model, 'name': values.view_name, 'priority': values.priority, 'type': values.view_type, 'arch': arch}; + self.dataset.create(vals, function(suc) { + def.resolve(); + }); + }); + } + }); + return def.promise(); + }, + on_valid_create_view: function(widgets) { + var msg = ""; + this.do_warn("The following fields are invalid :", msg); + }, + add_node_name : function(node) { + if(node.tagName.toLowerCase() == "button" || node.tagName.toLowerCase() == "field"){ + return (node.getAttribute('name'))? + _.str.sprintf( "<%s name='%s'>",node.tagName.toLowerCase(), node.getAttribute('name')): + _.str.sprintf( "<%s>",node.tagName.toLowerCase()); + }else if(node.tagName.toLowerCase() == "group"){ + return (node.getAttribute('string'))? + _.str.sprintf( "<%s>",node.getAttribute('string')): + _.str.sprintf( "<%s>",node.tagName.toLowerCase()); + }else{ + return (node.getAttribute('string'))? + _.str.sprintf( "<%s string='%s'>",node.tagName.toLowerCase(), node.getAttribute('string')): + _.str.sprintf( "<%s>",node.tagName.toLowerCase()); } }, - xml_node_create: function(xml, root, parent_list, parent_id, main_object){ + do_delete_view: function() { + 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; + }); + } + }, + create_View_Node: function(node){ + ViewNode = { + 'level': ($(node).parents()).length + 1, + 'id': this.xml_element_id += 1, + 'att_list': [], + 'name': this.add_node_name(node), + 'child_id': [] + } + ViewNode.att_list.push(node.tagName.toLowerCase()); + _.each(node.attributes, function(att) { + ViewNode.att_list.push([att.nodeName, att.nodeValue]); + }); + return ViewNode; + }, + append_child_object: function(main_object, parent_id, child_obj_list) { + var self = this; + if (main_object.id == parent_id) { + main_object.child_id = child_obj_list; + return main_object; + } else { + _.each(main_object.child_id, function(child_object) { + self.append_child_object(child_object, parent_id, child_obj_list); + }); + } + }, + convert_arch_to_obj: function(xml_Node, main_object, parent_id) { var self = this; var child_obj_list = []; - var children_list = $(xml).filter(root).children(); - var parents = $(children_list[0]).parents().get(); - _.each(children_list, function (child_node) { - child_obj_list.push(self.check_attr(child_node,child_node.tagName.toLowerCase(),parents.length)); + _.each(xml_Node, function(element) { + child_obj_list.push(self.create_View_Node(element)); }); - if (children_list.length != 0) { - if (parents.length <= parent_list.length) { - parent_list.splice(parents.length - 1); + this.append_child_object(main_object, parent_id, child_obj_list); + var obj_xml_list = _.zip(xml_Node, child_obj_list); + _.each(obj_xml_list, function(node) { + var children = _.filter(node[0].childNodes, function(child) { + return child.nodeType == 1; + }); + if (children) { + self.convert_arch_to_obj(children, main_object, node[1].id); } - parent_list.push(parent_id); - self.save_object(main_object[0], parent_list.slice(1), child_obj_list); - } - for (var i = 0; i < children_list.length; i++) { - self.xml_node_create - (children_list[i], children_list[i].tagName.toLowerCase(), - parent_list, child_obj_list[i].id, main_object); - } + }); return main_object; }, parse_xml: function(arch, view_id) { - var root = $(arch).filter(":first")[0]; - var tag = root.tagName.toLowerCase(); - var obj ={'child_id':[],'id':this.xml_id++,'level':0,'att_list':[],'name':""}; - var root_object = this.check_attr(root,tag,0); - obj.child_id = this.xml_node_create(arch, tag, [], this.xml_id-1, [root_object], []) - return [obj]; + main_object = { + 'level': 0, + 'id': this.xml_element_id +=1, + 'att_list': [], + 'name': _.str.sprintf("", view_id), + 'child_id': [] + }; + var xml_arch = QWeb.load_xml(arch); + return [this.convert_arch_to_obj(xml_arch.childNodes, main_object, this.xml_element_id)]; }, - get_data: function() { + get_arch: function() { var self = this; var view_arch_list = []; - self.main_view_id =((this.view_edit_dialog.$element.find("input[name='radiogroup']:checked").parent()).parent()).attr('data-id'); - var ve_dataset = new openerp.web.DataSet(this, 'ir.ui.view'); - ve_dataset.read_ids([parseInt(self.main_view_id)], ['arch', 'type'], function (arch) { - one_object = self.parse_xml(arch[0].arch,self.main_view_id); - self.main_view_type = arch[0].type - view_arch_list.push({"view_id" : self.main_view_id, "arch" : arch[0].arch}); - dataset = new openerp.web.DataSetSearch(self, 'ir.ui.view', null, null); - dataset.read_slice([], {domain : [['inherit_id','=', parseInt(self.main_view_id)]]}, function (result) { - _.each(result, function(res) { - view_arch_list.push({"view_id":res.id,"arch":res.arch}); - self.inherit_view(one_object, res); - }); - return self.edit_view({"main_object": one_object, - "parent_child_id": self.parent_child_list(one_object, []), - "arch": view_arch_list}); - }); - }); - }, - parent_child_list : function(one_object, p_list) { - var self = this; - _.each(one_object , function(element){ - if(element.child_id.length != 0){ - p_list.push({"key":element.id,"value":_.pluck(element.child_id, 'id')}); - self.parent_child_list(element.child_id, p_list); - } - }); - return p_list; - }, - inherit_view : function(one_object, result) { - var self = this; - var root = $(result.arch).filter('*'); - var xml_list = []; - if (root[0].tagName.toLowerCase() == "data") { - xml_list = $(root[0]).children(); - } else { - xml_list.push(root[0]); - } - _.each(xml_list , function(xml){ - var parent_id; - var check_list = []; - var xpath_object = self.parse_xml(xml,result.id); - if (xml.tagName.toLowerCase() == "xpath" ) { - var part_expr = _.without($(xml).attr('expr').split("/"),""); - _.each(part_expr,function(part){ - check_list.push(_.without($.trim(part.replace(/[^a-zA-Z 0-9 _]+/g,'!')).split("!"),"")); + this.dataset.read_ids([parseInt(self.main_view_id)], ['arch', 'type'], function(arch) { + if (arch.length) { + var arch_object = self.parse_xml(arch[0].arch, self.main_view_id); + self.main_view_type = arch[0].type == 'tree'? 'list': arch[0].type; + view_arch_list.push({"view_id": self.main_view_id, "arch": arch[0].arch}); + self.dataset.read_slice([], {domain: [['inherit_id','=', parseInt(self.main_view_id)]]}, function(result) { + _.each(result, function(res) { + view_arch_list.push({"view_id": res.id, "arch": res.arch}); + self.inherit_view(arch_object, res); + }); + return self.edit_view({"main_object": arch_object, + "parent_child_id": self.parent_child_list(arch_object, []), + "arch": view_arch_list}); }); } else { - var temp = []; - _.each(xpath_object[0].child_id[0].att_list, function(list){ - if(!_.include(list, "position")){ - temp.push(list); - } - }); - check_list = [_.flatten(temp)]; + self.do_warn("Please select view in list :"); } - self.full_path_search(check_list ,one_object ,xpath_object); }); }, - full_path_search: function(check_list ,val ,xpath_object) { + parent_child_list : function(one_object, parent_list) { var self = this; - if(xpath_object.length!=0){ - var check = check_list[0]; - var obj; + _.each(one_object , function(element) { + if (element.child_id.length != 0) { + parent_list.push({"key": element.id, "value": _.pluck(element.child_id, 'id')}); + self.parent_child_list(element.child_id, parent_list); + } + }); + return parent_list; + }, + inherit_view : function(arch_object, result) { + var self = this, xml_list = [], xml_arch = QWeb.load_xml(result.arch); + if (xml_arch.childNodes[0].tagName == "data") { + xml_list = _.filter(xml_arch.childNodes[0].childNodes, function(child) { + return child.nodeType == 1; + }); + } else { + xml_list.push( xml_arch.childNodes[0]); + } + _.each(xml_list, function(xml) { + var expr_to_list = [], xpath_arch_object = self.parse_xml(QWeb.tools.xml_node_to_string(xml), result.id); + if (xml.tagName == "xpath") { + var part_expr = _.without(xml.getAttribute('expr').split("/"), ""); + _.each(part_expr, function(part) { + expr_to_list.push(_.without($.trim(part.replace(/[^a-zA-Z 0-9 _]+/g,'!')).split("!"), "")); + }); + } else { + var temp = _.reject(xpath_arch_object[0].child_id[0].att_list, function(list) { + return list instanceof Array? _.include(list, "position"): false; + }); + expr_to_list = [_.flatten(temp)]; + } + self.inherit_apply(expr_to_list, arch_object ,xpath_arch_object); + }); + }, + inherit_apply: function(expr_list ,arch_object ,xpath_arch_object) { + var self = this; + if (xpath_arch_object.length) { + var check = expr_list[0], obj = false; switch (check.length) { case 2: - if(parseInt(check[1])){ - var list_1 = _.select(val,function(element){ - var main_list = _.flatten(element.att_list); - return _.include(main_list, check[0]); + if (parseInt(check[1])) { + //for field[3] + var temp_list = _.select(arch_object, function(element) { + return _.include(_.flatten(element.att_list), check[0]); }); - obj = val[_.indexOf(val,list_1[parseInt(check[1])-1])]; + obj = arch_object[_.indexOf(arch_object, temp_list[parseInt(check[1]) - 1])]; } else { - obj = _.detect(val, function(element){ - var main_list = _.flatten(element.att_list); - return _.include(main_list, check[0]); + //for notebook[last()] + obj = _.detect(arch_object, function(element) { + return _.include(_.flatten(element.att_list), check[0]); }); } break; case 3: - obj = _.detect(val,function(element){ - var main_list = _.flatten(element.att_list); - check = _.uniq(check); - var insert = _.intersection(main_list,check); - if(insert.length == check.length ){return element;} + //for field[@name='type'] + obj = _.detect(arch_object, function(element){ + if ((_.intersection(_.flatten(element.att_list), _.uniq(check))).length == check.length) { + return element; + } }); break; case 1: - var list_1 = _.select(val,function(element){ - var main_list = _.flatten(element.att_list); - return _.include(main_list, check[0]); + //for /form/notebook + var temp_list = _.select(arch_object, function(element) { + return _.include(_.flatten(element.att_list), check[0]); }); - if(list_1.length != 0){ - (check_list.length == 1)? obj = list_1[0] : check_list.shift(); + if (temp_list.length != 0) { + expr_list.length == 1 ? obj = temp_list[0] : expr_list.shift(); } break; } - if(obj) { - check_list.shift(); - if (check_list.length !=0){ - self.full_path_search(check_list ,obj.child_id ,xpath_object); + if (obj) { + expr_list.shift(); + if (expr_list.length) { + self.inherit_apply(expr_list, obj.child_id, xpath_arch_object); } else { - var level = obj.level+1; - self.increase_level(xpath_object[0], level) - obj.child_id.push(xpath_object[0]); - xpath_object.pop(); - return; + self.increase_level(xpath_arch_object[0], obj.level + 1); + obj.child_id.push(xpath_arch_object[0]); + xpath_arch_object.pop(); } - } - else { - _.each(val,function(element){ - self.full_path_search(check_list ,element.child_id ,xpath_object); + } else { + _.each(arch_object, function(element) { + self.inherit_apply(expr_list, element.child_id, xpath_arch_object); }); } } @@ -253,30 +358,39 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ self.increase_level(val, level + 1); }); }, + do_select_row: function(row_id) { + this.edit_xml_dialog.$element.find("tr[id^='viewedit-']").removeClass('ui-selected'); + this.edit_xml_dialog.$element.find("tr[id=viewedit-" + row_id + "]").addClass('ui-selected'); + }, + do_parent_img_hide_show: function(img) { + if ($(img).attr('src') == '/web/static/src/img/collapse.gif') { + $(img).attr('src', '/web/static/src/img/expand.gif'); + this.on_expand(img); + } else { + $(img).attr('src', '/web/static/src/img/collapse.gif'); + this.on_collapse(img); + } + }, edit_view: function(one_object) { var self = this; - this.edit_xml_dialog = new openerp.web.Dialog(this,{ + this.one_object = one_object; + this.edit_xml_dialog = new openerp.web.Dialog(this, { modal: true, - title: 'View Editor', + title: _.str.sprintf("View Editor %d - %s", self.main_view_id, self.model), width: 750, height: 500, buttons: { - "Inherited View": function(){ - //todo - }, - "Preview": function(){ + "Preview": function() { var action = { - context:self.session.user_context, - res_model : self.model, - views : [[self.main_view_id, self.main_view_type]], + context: self.session.user_context, + res_model: self.model, + views: [[self.main_view_id, self.main_view_type]], type: 'ir.actions.act_window', target: "new", flags: { sidebar: false, views_switcher: false, - action_buttons:false, - search_view:false, - pager:false, + action_buttons: false, }, }; var action_manager = new openerp.web.ActionManager(self); @@ -286,231 +400,765 @@ openerp.web.ViewEditor = openerp.web.Widget.extend({ self.edit_xml_dialog.close(); } } + }).start().open(); + var no_property_att = []; + _.each(_PROPERTIES, function(val, key) { + if (! val.length) no_property_att.push(key); }); - this.edit_xml_dialog.start().open(); - this.edit_xml_dialog.$element.html(QWeb.render('view_editor', { - 'data': one_object['main_object'], - })); + this.edit_xml_dialog.$element.html(QWeb.render('view_editor', {'data': one_object['main_object'], 'no_properties': no_property_att})); this.edit_xml_dialog.$element.find("tr[id^='viewedit-']").click(function() { - self.edit_xml_dialog.$element.find("tr[id^='viewedit-']").removeClass('ui-selected'); - $(this).addClass('ui-selected'); + self.do_select_row(this.id.split('-')[1]); }); this.edit_xml_dialog.$element.find("img[id^='parentimg-']").click(function() { - if ($(this).attr('src') == '/web/static/src/img/collapse.gif') { - $(this).attr('src', '/web/static/src/img/expand.gif'); - self.on_expand(this); - } else { - $(this).attr('src', '/web/static/src/img/collapse.gif'); - var id = this.id.split('-')[1]; - self.on_collapse(this,one_object['parent_child_id'], one_object['main_object']); - } + self.do_parent_img_hide_show(this); }); this.edit_xml_dialog.$element.find("img[id^='side-']").click(function() { - var side = $(this).closest("tr[id^='viewedit-']") - var id_tr = (side.attr('id')).split('-')[1]; - var img = side.find("img[id='parentimg-"+id_tr+"']").attr('src'); ; - var level = parseInt(side.attr('level')); - var list_shift =[]; - var last_tr; - var cur_tr = side; - list_shift.push(side); - var next_tr; - var ls = side; - var view_id; - var view_xml_id; - while(1){ - ls = ls.prev(); - if((self.edit_xml_dialog.$element.find(ls).find('a').text()).search("view_id") != -1 - && parseInt(ls.attr('level')) < level){ - view_id = parseInt(($(ls).find('a').text()).replace(/[^0-9]+/g,'')); - view_xml_id = (ls.attr('id')).split('-')[1]; + self.on_select_img(this); + }); + }, + on_select_img: function(element_img) { + var self = this; + var side = $(element_img).closest("tr[id^='viewedit-']"); + this.one_object.clicked_tr_id = parseInt((side.attr('id')).split('-')[1]); + this.one_object.clicked_tr_level = parseInt(side.attr('level')); + var img = side.find("img[id='parentimg-" + this.one_object.clicked_tr_id + "']").attr('src'); + var view_id = 0, view_xml_id = 0, view_find = side; + //for view id finding + var min_level = this.one_object.clicked_tr_id; + if (($(side).find('a').text()).search("view_id") != -1) { + view_id = parseInt(($(view_find).find('a').text()).replace(/[^0-9]+/g, '')); + view_xml_id = (view_find.attr('id')).split('-')[1]; + this.one_object.clicked_tr_id += 1; + this.one_object.clicked_tr_level += 1; + }else{ + 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, '')); + view_xml_id = parseInt((view_find.attr('id')).split('-')[1]); break; } + if (view_find.attr('level') < min_level) { + min_level = parseInt(view_find.attr('level')); + } } - switch (this.id) { - case "side-add": - break; - case "side-remove": - break; - case "side-edit": - break; - case "side-up": - while (1) { - var prev_tr = cur_tr.prev(); - if(level >= parseInt(prev_tr.attr('level')) || prev_tr.length == 0) { - last_tr = prev_tr; - break; - } - cur_tr = prev_tr; - } - if (img) { - while (1) { - next_tr = side.next(); - if ( parseInt(next_tr.attr('level')) <= level || next_tr.length == 0) { - break; - } else { - list_shift.push(next_tr); - side = next_tr; - } - } - } - if (last_tr.length != 0 && parseInt(last_tr.attr('level')) == level && - (self.edit_xml_dialog.$element.find(last_tr).find('a').text()).search("view_id") == -1) { - _.each(list_shift, function(rec) { - $(last_tr).before(rec); - }); - self.save_move_arch(one_object, view_id, view_xml_id, id_tr, level, "up"); - } + } + this.one_object.clicked_tr_view = [view_id, view_xml_id]; + switch (element_img.id) { + case "side-add": + self.do_node_add(side); + break; + case "side-remove": + if (confirm(_t("Do you really want to remove this node?"))) { + self.do_save_update_arch("remove_node"); + } + break; + case "side-edit": + self.do_node_edit(side); + break; + case "side-up": + self.do_node_up(side, img); break; case "side-down": - if (img) { - while (1) { - next_tr = cur_tr.next(); - if ( parseInt(next_tr.attr('level')) <= level || next_tr.length == 0) { - last_tr = next_tr; - break; - } else { - list_shift.push(next_tr); - cur_tr = next_tr; - } - } - } - else { - last_tr = cur_tr.next(); - } - if((self.edit_xml_dialog.$element.find(last_tr).find('a').text()).search("view_id") != -1){ - return; - } - if (last_tr.length != 0 && parseInt(last_tr.attr('level')) == level) { - var last_tr_id = (last_tr.attr('id')).split('-')[1]; - img = last_tr.find("img[id='parentimg-" + last_tr_id + "']").attr('src'); - if (img) { - self.edit_xml_dialog.$element.find("img[id='parentimg-" + last_tr_id + "']"). - attr('src', '/web/static/src/img/expand.gif'); - while (1) { - var next_tr = last_tr.next(); - if (next_tr.attr('level') <= level || next_tr.length == 0) break; - next_tr.hide(); - last_tr = next_tr; - } - } - list_shift.reverse(); - _.each(list_shift, function(rec) { - $(last_tr).after(rec); - }); - self.save_move_arch(one_object, view_id, view_xml_id, id_tr, level, "down"); - } + self.do_node_down(side, img); break; - } + } + }, + do_node_add: function(side){ + var self = this; + var tr = $(side).find('a').text(); + var parent_tr = ($(side).prevAll("tr[level=" + String(this.one_object.clicked_tr_level - 1) + "]"))[0]; + var field_dataset = new openerp.web.DataSetSearch(this, this.model, null, null); + parent_tr = $(parent_tr).find('a').text(); + field_dataset.call( 'fields_get', [], function(result) { + var fields = _.keys(result); + fields.push(" "),fields.sort(); + var property_to_check = []; + _.each([tr, parent_tr],function(element) { + property_to_check.push( + _.detect(_.keys(_CHILDREN),function(res){ + return _.str.include(element, res); + })); + }); + self.on_add_node(property_to_check, fields); }); }, - save_move_arch: function(one_object, view_id, view_xml_id, id_tr, level, move_direct){ + do_node_edit: function(side) { var self = this; - var arch = _.detect(one_object['arch'],function(element){ - return element.view_id == view_id; - }); - var obj = self.get_view_object(view_xml_id, one_object['main_object'], []); - if(($(arch.arch).filter("data")).length != 0 && view_xml_id != 0){ + var result = self.get_object_by_id(this.one_object.clicked_tr_id, this.one_object['main_object'], []); + if (result.length && result[0] && result[0].att_list) { + var properties = _PROPERTIES[result[0].att_list[0]]; + self.on_edit_node(properties); + } + }, + do_node_down: function(cur_tr, img) { + var self = this, next_tr, last_tr, tr_to_move = []; + tr_to_move.push(cur_tr); + if (img) { + while (1) { + next_tr = cur_tr.next(); + if ( parseInt(next_tr.attr('level')) <= this.one_object.clicked_tr_level || next_tr.length == 0) { + last_tr = next_tr; + break; + } else { + tr_to_move.push(next_tr); + cur_tr = next_tr; + } + } + } else { + last_tr = cur_tr.next(); + } + if ((self.edit_xml_dialog.$element.find(last_tr).find('a').text()).search("view_id") != -1) { + return false; + } + if (last_tr.length != 0 && parseInt(last_tr.attr('level')) == this.one_object.clicked_tr_level) { + var last_tr_id = (last_tr.attr('id')).split('-')[1]; + img = last_tr.find("img[id='parentimg-" + last_tr_id + "']").attr('src'); + if (img) { + self.edit_xml_dialog.$element.find("img[id='parentimg-" + last_tr_id + "']"). + attr('src', '/web/static/src/img/expand.gif'); + while (1) { + var next_tr = last_tr.next(); + if (next_tr.attr('level') <= this.one_object.clicked_tr_level || next_tr.length == 0) break; + next_tr.hide(); + last_tr = next_tr; + } + } + tr_to_move.reverse(); + _.each(tr_to_move, function(rec) { + $(last_tr).after(rec); + }); + self.do_save_update_arch("down"); + } + }, + do_node_up: function(cur_tr, img) { + var self = this, side = cur_tr, tr_to_move = []; + tr_to_move.push(side); + while (1) { + var prev_tr = cur_tr.prev(); + if (this.one_object.clicked_tr_level >= parseInt(prev_tr.attr('level')) || prev_tr.length == 0) { + last_tr = prev_tr; + break; + } + cur_tr = prev_tr; + } + if (img) { + self.edit_xml_dialog.$element.find("img[id='parentimg-" + this.one_object.clicked_tr_id + "']"). + attr('src', '/web/static/src/img/expand.gif'); + while (1) { + next_tr = side.next(); + if (parseInt(next_tr.attr('level')) <= this.one_object.clicked_tr_level || next_tr.length == 0) { + break; + } else { + next_tr.hide(); + tr_to_move.push(next_tr); + side = next_tr; + } + } + } + if (last_tr.length != 0 && parseInt(last_tr.attr('level')) == this.one_object.clicked_tr_level && + (self.edit_xml_dialog.$element.find(last_tr).find('a').text()).search("view_id") == -1) { + _.each(tr_to_move, function(rec) { + $(last_tr).before(rec); + }); + self.do_save_update_arch("up"); + } + }, + do_save_update_arch: function(move_direct, update_values) { + var self = this; + var arch = _.detect(self.one_object['arch'], function(element) + {return element.view_id == self.one_object.clicked_tr_view[0]}); + var obj = self.get_object_by_id(this.one_object.clicked_tr_view[1],this.one_object['main_object'], []); + //for finding xpath tag from inherit view + var xml_arch = QWeb.load_xml(arch.arch); + if (xml_arch.childNodes[0].tagName == "data") { var check_list = _.flatten(obj[0].child_id[0].att_list); - arch.arch = _.detect($(arch.arch).children(), function(xml_child){ - var temp_obj = self.check_attr(xml_child, xml_child.tagName.toLowerCase()); - var main_list = _.flatten(temp_obj.att_list); - check_list = _.uniq(check_list); - var insert = _.intersection(main_list,check_list); - if(insert.length == check_list.length ){return xml_child;} + var children = _.filter(xml_arch.childNodes[0].childNodes, function (child) { + return child.nodeType == 1; + }); + 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;} }); } - return self.get_node(arch.arch, obj[0].child_id[0], parseInt(id_tr), [], parseInt(level), - parseInt(view_id), arch, move_direct); + 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],[], move_direct, update_values,arch); }, - - get_view_object: function(view_xml_id, one_object,result){ + get_object_by_id: function(id, one_object, result) { var self = this; - if(result.length==0){ - var check = _.detect(one_object , function(obj){ - return view_xml_id==obj.id; + if (result.length == 0 ) { + var check = _.detect(one_object , function(obj) { + return id == obj.id; }); - if(check){result.push(check);}; - _.each(one_object, function(obj){ - self.get_view_object(view_xml_id, obj.child_id, result); + if (check) {result.push(check);}; + _.each(one_object, function(obj) { + self.get_object_by_id(id,obj.child_id, result); }); } return result; }, - get_node: function(arch1, obj, id, child_list, level, view_id, arch, move_direct){ + create_clone: function(clone, new_node_obj, position){ var self = this; - var children_list = $(arch1).children(); - var list_obj_xml = _.zip(children_list,obj.child_id); - if (id) { - if (obj.id == id) { - var id; - var parent = $(arch1).parents(); - var index = _.indexOf(child_list, obj) - var re_insert_obj = child_list.splice(index, 1); + clone.find('a').text(new_node_obj.name); + ($(clone.find('a').parent()).siblings('td')).css( "padding-left", 20 * new_node_obj.level); + clone.attr("id", "viewedit-" + new_node_obj.id); + clone.attr("level", new_node_obj.level); + clone.find("img[id^='parentimg-']").remove(); + clone.bind("click",function(){ + self.do_select_row(this.id.split('-')[1]); + }); + clone.find("img[id^='side-']").click(function() { + self.on_select_img(this); + }); + 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); + if (this.one_object.clicked_tr_id) { + if (obj.id == this.one_object.clicked_tr_id) { + var parent = false, index = _.indexOf(child_list, obj); if (move_direct == "down") { var next = $(arch1).next(); $(next).after(arch1); + var re_insert_obj = child_list.splice(index, 1); child_list.splice(index+1, 0, re_insert_obj[0]); - } else { + parent = $(arch1).parents(); + } else if (move_direct == "up") { var prev = $(arch1).prev(); $(prev).before(arch1); + var re_insert_obj = child_list.splice(index, 1); child_list.splice(index-1, 0, re_insert_obj[0]); + parent = $(arch1).parents(); + } else if (move_direct == "update_node") { + _.each(update_values, function(val){ + if (val[1]) $(arch1)[0].setAttribute(val[0], val[1]); + else $(arch1)[0].removeAttribute(val[0]); + }); + var new_obj = self.create_View_Node(arch1); + new_obj.id = obj.id,new_obj.child_id = obj.child_id; + self.edit_xml_dialog.$element. + find("tr[id='viewedit-"+this.one_object.clicked_tr_id+"']"). + find('a').text(new_obj.name); + child_list.splice(index, 1, new_obj); + parent = $(arch1).parents(); + } else if(move_direct == "add_node") { + var tr_click = self.edit_xml_dialog.$element.find("tr[id='viewedit-"+self.one_object.clicked_tr_id+"']"), + temp_xml = QWeb.load_xml(update_values[0]), + object_xml = self.create_View_Node(temp_xml.childNodes[0]); + (update_values[1] == "Inside")? object_xml.level = obj.level + 1:object_xml.level = obj.level; + var clone = self.create_clone(tr_click.clone(),object_xml), + after_append = _.detect(self.one_object['parent_child_id'],function(ele){ + return self.one_object.clicked_tr_id == ele.key; + }); + after_append = (after_append)?_.last(after_append.value):self.one_object.clicked_tr_id; + switch (update_values[1]) { + case "After": + self.edit_xml_dialog.$element. + find("tr[id='viewedit-"+after_append+"']").after(clone); + $(arch1).after(update_values[0]); + child_list.splice(index + 1, 0, object_xml); + break; + case "Before": + tr_click.before(clone); + $(arch1).before(update_values[0]); + child_list.splice(index - 1, 0, object_xml); + break; + case "Inside": + if (tr_click.find("img[id^='parentimg-']").length == 0) { + ($(tr_click.find('a').parent()).siblings('td')) + .append($('').attr('src', '/web/static/src/img/collapse.gif'). + attr('id','parentimg-'+ self.one_object.clicked_tr_id).click(function(){ + self.do_parent_img_hide_show(this); + })); + } + $(arch1).append(update_values[0]); + self.edit_xml_dialog.$element. + find("tr[id='viewedit-"+after_append+"']").after(clone); + obj.child_id.push(object_xml); + break; + } + self.edit_xml_dialog.$element. + find("tr[id='viewedit-" + object_xml.id + "']").removeClass('ui-selected'); + parent = $(arch1).parents(); + } else if (move_direct == "remove_node") { + parent = $(arch1).parents(); + if (parent.length == 0 || (parent[0].tagName.toLowerCase() == "data")) { + self.one_object.clicked_tr_id = self.one_object.clicked_tr_id -1; + self.one_object.clicked_tr_level = self.one_object.clicked_tr_level - 1; + (parent.length == 0)?parent.push("remove_view"):false; + } + $(arch1).remove(); + child_list.splice(index,1); + var cur_tr = self.edit_xml_dialog.$element. + find("tr[id='viewedit-" + self.one_object.clicked_tr_id + "']"); + _.each(self.get_list_tr(cur_tr,self.one_object.clicked_tr_level), function(tr_element){ + tr_element.remove(); + }); + cur_tr.remove(); + var parent_img = _.detect(self.one_object['parent_child_id'],function(element){ + return _.include(element.value, self.one_object.clicked_tr_id); + }); + if(parent_img.value.length == 1){ + self.edit_xml_dialog.$element. + find("tr[id='viewedit-"+parent_img.key+"']"). + find("img[id^='parentimg-']").remove(); + } + self.one_object['parent_child_id'] = self.parent_child_list(self.one_object['main_object'],[]); } - parent = parent[parent.length-1]; - var convert_to_utf = self.xml2Str(parent); - if (convert_to_utf) { + var convert_to_utf = (parent.length != 0)? parent[parent.length-1]: arch1; + if (convert_to_utf != "remove_view") { + convert_to_utf = QWeb.tools.xml_node_to_string(convert_to_utf); convert_to_utf = convert_to_utf.replace('xmlns="http://www.w3.org/1999/xhtml"', ""); convert_to_utf = '' + convert_to_utf; arch.arch = convert_to_utf; - dataset = new openerp.web.DataSet(this, 'ir.ui.view'); - dataset.write(parseInt(view_id),{"arch":convert_to_utf}, function(r) { - }); + this.dataset.write(this.one_object.clicked_tr_view[0] ,{"arch":convert_to_utf}, function(r) {}); + } else { + this.dataset.unlink([this.one_object.clicked_tr_view[0]],function(res) {}); + } + if(move_direct == "add_node"){ + self.add_node_dialog.close(); + self.on_select_img(clone.find("img[id='side-edit']")[0]); + self.one_object['parent_child_id'] = self.parent_child_list(self.one_object['main_object'],[]); } } - if (obj.level <= level) { + if (obj.level <= this.one_object.clicked_tr_level) { _.each(list_obj_xml, function(child_node) { - self.get_node(child_node[0], child_node[1], id, obj.child_id, level, view_id, arch, move_direct); + self.do_save_xml(child_node[0], child_node[1], obj.child_id, move_direct, update_values, arch); }); } } }, - xml2Str: function(xmlNode) { - try { - return (new XMLSerializer()).serializeToString(xmlNode); - } - catch (e) { - try { - return xmlNode.xml; - } - catch (e) { - return false; - } - } - - }, on_expand: function(expand_img){ var level = parseInt($(expand_img).closest("tr[id^='viewedit-']").attr('level')); var cur_tr = $(expand_img).closest("tr[id^='viewedit-']"); + _.each(this.get_list_tr(cur_tr,level), function(tr_element){ + tr_element.hide(); + }); + }, + get_list_tr: function(cur_tr,level){ + tr_list = []; while (1) { var nxt_tr = cur_tr.next(); - if (parseInt(nxt_tr.attr('level')) > level){ + if (parseInt(nxt_tr.attr('level')) > level) { cur_tr = nxt_tr; - nxt_tr.hide(); - } else return nxt_tr; + tr_list.push(nxt_tr); + } else return tr_list; } }, - on_collapse: function(collapse_img, parent_child_id, id, main_object) { - var self = this; - var id = collapse_img.id.split('-')[1]; - var datas = _.detect(parent_child_id,function(res) { + on_collapse: function(collapse_img) { + var self = this, id = collapse_img.id.split('-')[1]; + var datas = _.detect(self.one_object['parent_child_id'] , function(res) { return res.key == id; }); - _.each(datas.value, function(rec) { - var tr = self.edit_xml_dialog.$element.find("tr[id='viewedit-"+rec+"']"); - tr.find("img[id='parentimg-"+rec+"']").attr('src','/web/static/src/img/expand.gif'); + _.each(datas.value, function (rec) { + var tr = self.edit_xml_dialog.$element.find("tr[id='viewedit-" + rec + "']"); + tr.find("img[id='parentimg-" + rec + "']").attr('src', '/web/static/src/img/expand.gif'); tr.show(); }); + }, + on_edit_node: function(properties){ + var self = this; + this.edit_node_dialog = new openerp.web.Dialog(this,{ + modal: true, + title: 'Properties', + width: 500, + height: 400, + buttons: { + "Update": function(){ + var warn = false, update_values = []; + _.each(self.edit_widget, function(widget) { + if (widget.is_invalid) { + warn = true; + return false; + }; + if (widget.dirty && !widget.is_invalid) { + update_values.push([widget.name, widget.get_value()]); + } + }); + if (warn) { + self.on_valid_create_view(self.edit_widget); + } else { + self.do_save_update_arch("update_node", update_values); + self.edit_node_dialog.close(); + } + }, + "Cancel": function(){ + self.edit_node_dialog.close(); + } + } + }); + this.edit_node_dialog.start().open(); + var _PROPERTIES_ATTRIBUTES = { + 'name' : {'name':'name', 'string': 'Name', 'type': 'char'}, + 'string' : {'name':'string', 'string': 'String', 'type': 'char'}, + 'required' : {'name':'required', 'string': 'Required', 'type': 'boolean'}, + 'readonly' : {'name':'readonly', 'string': 'Readonly', 'type': 'boolean'}, + 'domain' : {'name':'domain', 'string': 'Domain', 'type': 'char'}, + 'context' : {'name':'context', 'string': 'Context', 'type': 'char'}, + 'limit' : {'name':'limit', 'string': 'Limit', 'type': 'float'}, + 'min_rows' : {'name':'min_rows', 'string': 'Minimum rows', 'type': 'float'}, + 'date_start' : {'name':'date_start', 'string': 'Start date', 'type': 'char'}, + 'date_delay' : {'name':'date_delay', 'string': 'Delay date', 'type': 'char'}, + 'day_length' : {'name':'day_length', 'string': 'Day length', 'type': 'char'}, + 'mode' : {'name':'mode', 'string': 'Mode', 'type': 'char'}, + 'align' : {'name':'align', 'string': 'Alignment ', 'type': 'selection', 'selection': [['', ''], ['0.0', 'Left'], ['0.5', 'Center'], ['1.0', 'Right']]}, + 'icon' : {'name':'icon', 'string': 'Icon', 'type': 'selection', 'selection': _ICONS}, + 'type' : {'name':'type', 'string': 'Type', 'type': 'selection', 'selection': [['', ''], ['action', 'Action'], ['object', 'Object'], ['workflow', 'Workflow'], ['server_action', 'Server Action']]}, + 'special' : {'name':'special', 'string': 'Special', 'type': 'selection', 'selection': [['',''],['save', 'Save Button'], ['cancel', 'Cancel Button'], ['open', 'Open Button']]}, + 'target' : {'name':'target', 'string': 'Target', 'type': 'selection', 'selection': [['', ''], ['new', 'New Window']]}, + 'confirm' : {'name':'confirm', 'string': 'Confirm', 'type': 'char'}, + 'style' : {'name':'style', 'string': 'Style', 'type': 'selection', 'selection':[["",""],["1", "1"],["1-1", "1-1"],["1-2", "1-2"],["2-1", "2-1"],["1-1-1", "1-1-1"]]}, + 'filename' : {'name':'filename', 'string': 'File Name', 'type': 'char'}, + 'width' : {'name':'width', 'string': 'Width', 'type': 'float'}, + 'height' : {'name':'height', 'string': 'Height', 'type': 'float'}, + 'attrs' : {'name':'attrs', 'string': 'Attrs', 'type': 'char'}, + 'col' : {'name':'col', 'string': 'col', 'type': 'float'}, + 'link' : {'name':'link', 'string': 'Link', 'type': 'char'}, + 'position' : {'name':'position', 'string': 'Position', 'type': 'selection', 'selection': [['',''],['after', 'After'],['before', 'Before'],['inside', 'Inside'],['replace', 'Replace']]}, + 'states' : {'name':'states', 'string': 'states', 'type': 'char'}, + 'eval' : {'name':'eval', 'string': 'Eval', 'type': 'char'}, + 'ref' : {'name':'ref', 'string': 'Ref', 'type': 'char'}, + 'on_change' : {'name':'on_change', 'string': 'On change', 'type': 'char'}, + 'nolabel' : {'name':'nolabel', 'string': 'No label', 'type': 'boolean'}, + 'completion' : {'name':'completion', 'string': 'Completion', 'type': 'boolean'}, + 'colspan' : {'name':'colspan', 'string': 'Colspan', 'type': 'float'}, + 'widget' : {'name':'widget', 'string': 'widget', 'type': 'selection'}, + 'colors' : {'name':'colors', 'string': 'Colors', 'type': 'char'}, + 'editable' : {'name':'editable', 'string': 'Editable', 'type': 'selection', 'selection': [["",""],["top","Top"],["bottom", "Bottom"]]}, + 'groups' : {'name':'groups', 'string': 'Groups', 'type': 'seleciton_multi'}, + }; + var arch_val = self.get_object_by_id(this.one_object.clicked_tr_id,this.one_object['main_object'], []); + this.edit_node_dialog.$element.append('
'); + this.edit_widget = []; + self.ready = $.when(self.on_groups(properties)).then(function () { + _PROPERTIES_ATTRIBUTES['groups']['selection'] = self.groups; + var values = _.keys( openerp.web.form.widgets.map); + values.push(''); + values.sort(); + _PROPERTIES_ATTRIBUTES['widget']['selection'] = values; + var widgets = _.filter(_PROPERTIES_ATTRIBUTES, function(property){ return _.include(properties, property.name)}) + _.each(widgets, function(widget) { + var type_widget = new (self.property.get_any([widget.type])) (self.edit_node_dialog, widget); + 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('' + widget.string + ':' + type_widget.render() + ''); + type_widget.start(); + type_widget.set_value(value); + self.edit_widget.push(type_widget); + }); + }); + }, + //for getting groups + on_groups: function(properties){ + var self = this, + def = $.Deferred(); + if (!_.include(properties, 'groups')) { + self.groups = false; + def.resolve(); + } + var group_ids = [], group_names = {}, groups = []; + var res_groups = new openerp.web.DataSetSearch(this,'res.groups', null, null), + model_data = new openerp.web.DataSetSearch(self,'ir.model.data', null, null); + res_groups + .read_slice([], {}) + .done(function(res_grp) { + _.each(res_grp,function(res){ + var key = res.id; + group_names[key]=res.name; + group_ids.push(res.id); + }); + model_data + .read_slice([],{domain:[['res_id', 'in', group_ids],['model','=','res.groups']]}) + .done(function(model_grp) { + _.each(model_grp, function(res_group) { + groups.push([res_group.module + "." + res_group.name,group_names[res_group.res_id]]); + }); + self.groups = groups; + def.resolve(); + }); + }) + return def.promise(); + }, + on_add_node: function(properties, fields){ + var self = this; + var render_list = [{'name': 'node_type','selection': _.keys(_CHILDREN).sort(), 'value': 'field', 'string': 'Node Type','type': 'selection'}, + {'name': 'field_value','selection': fields, 'value': false, 'string': '','type': 'selection'}, + {'name': 'position','selection': ['After','Before','Inside'], 'value': false, 'string': 'Position','type': 'selection'}]; + this.add_widget = []; + this.add_node_dialog = new openerp.web.Dialog(this,{ + modal: true, + title: 'Properties', + width: 450, + height: 190, + buttons: { + "Update": function(){ + var check_add_node = true, values = {}; + _.each(self.add_widget, function(widget) { + values[widget.name] = widget.get_value() || false; + }); + (values.position == "Inside")? + check_add_node =(_.include(_CHILDREN[properties[0]],values.node_type))?true:false: + check_add_node =(_.include(_CHILDREN[properties[1]],values.node_type))?true:false; + if(values.node_type == "field" && check_add_node ) + {check_add_node = (values.field_value != " ")?true:false; + } + if(check_add_node){ + var tag = (values.node_type == "field")? + _.str.sprintf("<%s name='%s'> ",values.node_type,values.field_value,values.node_type): + _.str.sprintf("<%s> ",values.node_type,values.node_type); + self.do_save_update_arch("add_node", [tag, values.position]); + }else{alert("Can't Update View");} + }, + "Cancel": function(){ + self.add_node_dialog.close(); + } + } + }).start().open(); + this.add_node_dialog.$element.append('
'); + var table_selector = self.add_node_dialog.$element.find('table[id=rec_table] tbody'); + _.each(render_list, function(node) { + type_widget = new (self.property.get_any([node.type])) (self.add_node_dialog, node); + if (node.name == "position") { + table_selector.append('' + node.string + '' + type_widget.render() + ''); + } else { + table_selector.append('' + node.string + '' + type_widget.render() ); + if (node.name == "field_value") { + table_selector.append(' '); + } + } + type_widget.start(); + type_widget.set_value(node.value); + self.add_widget.push(type_widget); + }); + table_selector.find("td[id^=]").attr("width","100px"); + self.add_node_dialog.$element.find('#new_field').click(function() { + model_data = new openerp.web.DataSetSearch(self,'ir.model', null, null); + model_data.read_slice([], {domain: [['model','=', self.model]]}, function(result) { + self.render_new_field(result[0].id); + }); + }); + }, + render_new_field :function(id){ + var self = this; + var action = { + context: {'default_model_id': id, 'manual':true}, + res_model: "ir.model.fields", + views: [[false, 'form']], + type: 'ir.actions.act_window', + target: "new", + flags: { + action_buttons: true, + } + } + var action_manager = new openerp.web.ActionManager(self); + $.when(action_manager.do_action(action)).then(function() { + var controller = action_manager.dialog_viewmanager.views['form'].controller; + controller.do_set_readonly.add_last(function(){ + action_manager.stop(); + new_fields_name = new openerp.web.DataSetSearch(self,'ir.model.fields', null, null); + new_fields_name.read_ids([controller.datarecord.id], ['name'], function(result) { + self.add_node_dialog.$element.find('select[id=field_value]').append($("").attr("value", result[0].name).text(result[0].name)); + _.detect(self.add_widget,function(widget){ + widget.name == "field_value"? widget.selection.push(result[0].name): false; + }); + }); + }); + }); } +}); +openerp.web.ViewEditor.Field = openerp.web.Class.extend({ + init: function(view, widget) { + this.$element = view.$element; + this.dirty = false; + this.name = widget.name; + this.selection = widget.selection || []; + this.required = widget.required || false; + this.string = widget.string || ""; + this.type = widget.type; + this.is_invalid = false; + }, + start: function () { + this.update_dom(); + }, + update_dom: function() { + this.$element.find("td[id=" + this.name + "]").toggleClass('invalid', this.is_invalid); + this.$element.find("td[id=" + this.name + "]").toggleClass('required', this.required); + }, + on_ui_change: function() { + this.validate(); + this.dirty = true; + this.update_dom(); + }, + validate: function() { + this.is_invalid = false; + try { + var value = openerp.web.parse_value(this.get_value(), this, ''); + this.is_invalid = this.required && value === ''; + } catch(e) { + this.is_invalid = true; + } + }, + render: function() { + return _.str.sprintf("%s", this.name, QWeb.render(this.template, {widget: this})) + }, +}); +openerp.web.ViewEditor.FieldBoolean = openerp.web.ViewEditor.Field.extend({ + template : "vieweditor_boolean", + start: function() { + var self = this; + this._super(); + this.$element.find("input[id="+ self.name+"]").change(function() { + self.on_ui_change(); + }); + }, + set_value: function(value) { + if (value) { + this.$element.find("input[id=" + this.name+ "]").attr('checked', true); + } + }, + get_value: function() { + return this.$element.find("input[id=" + this.name + "]").is(':checked')? "1" : null; + } +}); +openerp.web.ViewEditor.FieldChar = openerp.web.ViewEditor.Field.extend({ + template : "vieweditor_char", + start: function () { + var self = this; + this._super(); + this.$element.find("input[id="+ this.name+"]").css('width','100%').change(function() { + self.on_ui_change(); + }); + }, + set_value: function(value) { + this.$element.find("input[id=" + this.name + "]").val(value); + }, + get_value: function() { + return this.$element.find("input[id=" + this.name + "]").val(); + } +}); +openerp.web.ViewEditor.FieldSelect = openerp.web.ViewEditor.Field.extend({ + template : "vieweditor_selection", + start: function () { + var self = this; + this._super(); + this.$element.find("select[id=" + this.name + "]").css('width', '100%').change(function() { + self.on_ui_change(); + if (self.name == "node_type") { + if (self.get_value() == "field") { + self.$element.find('#new_field').show(); + self.$element.find("select[id=field_value]").show(); + } else { + self.$element.find('#new_field').hide(); + self.$element.find("select[id=field_value]").hide(); + } + } + }); + }, + set_value: function(value) { + var index = 0; + value = value === null? false: value; + for (var i = 0, ii = this.selection.length; i < ii; i++) { + if ((this.selection[i] instanceof Array && this.selection[i][1] === value) || this.selection[i] === value) index = i; + } + this.$element.find("select[id=" + this.name + "]")[0].selectedIndex = index; + }, + get_value: function() { + return this.$element.find("select[id=" + this.name + "]").val(); + } +}); +openerp.web.ViewEditor.FieldSelectMulti = openerp.web.ViewEditor.FieldSelect.extend({ + start: function () { + this._super(); + this.$element.find("select[id=" + this.name + "]").css('height', '100px').attr("multiple", true); + }, + set_value: function(value) { + var self = this; + self.$element.find("#groups option").attr("selected",false); + if (!value) return false; + _.each(this.selection, function(item) { + if (_.include(value.split(','), item[0])) { + self.$element.find("select[id="+self.name+"] option[value='" + item[0] +"']").attr("selected",1) + } + }); + } +}); +openerp.web.ViewEditor.FieldFloat = openerp.web.ViewEditor.FieldChar.extend({ +}); +var _PROPERTIES = { + 'field' : ['name', 'string', 'required', 'readonly', 'domain', 'context', 'nolabel', 'completion', + 'colspan', 'widget', 'eval', 'ref', 'on_change', 'attrs', 'groups'], + 'form' : ['string', 'col', 'link'], + 'notebook' : ['colspan', 'position', 'groups'], + 'page' : ['string', 'states', 'attrs', 'groups'], + 'group' : ['string', 'col', 'colspan', 'states', 'attrs', 'groups'], + 'image' : ['filename', 'width', 'height', 'groups'], + 'separator' : ['string', 'colspan', 'groups'], + 'label': ['string', 'align', 'colspan', 'groups'], + 'button': ['name', 'string', 'icon', 'type', 'states', 'readonly', 'special', 'target', 'confirm', 'context', 'attrs', 'colspan', 'groups'], + 'newline' : [], + 'board': ['style'], + 'column' : [], + 'action' : ['name', 'string', 'colspan', 'groups'], + 'tree' : ['string', 'colors', 'editable', 'link', 'limit', 'min_rows'], + 'graph' : ['string', 'type'], + 'calendar' : ['string', 'date_start', 'date_stop', 'date_delay', 'day_length', 'color', 'mode'], +}; +var _CHILDREN = { + 'form': ['notebook', 'group', 'field', 'label', 'button','board', 'newline', 'separator'], + 'tree': ['field'], + 'graph': ['field'], + 'calendar': ['field'], + 'notebook': ['page'], + 'page': ['notebook', 'group', 'field', 'label', 'button', 'newline', 'separator'], + 'group': ['field', 'label', 'button', 'separator', 'newline'], + 'board': ['column'], + 'action': [], + 'field': ['form', 'tree', 'graph'], + 'label': [], + 'button' : [], + 'newline': [], + 'separator': [], +}; +var _ICONS = ['','STOCK_ABOUT', 'STOCK_ADD', 'STOCK_APPLY', 'STOCK_BOLD', + 'STOCK_CANCEL', 'STOCK_CDROM', 'STOCK_CLEAR', 'STOCK_CLOSE', 'STOCK_COLOR_PICKER', + 'STOCK_CONNECT', 'STOCK_CONVERT', 'STOCK_COPY', 'STOCK_CUT', 'STOCK_DELETE', + 'STOCK_DIALOG_AUTHENTICATION', 'STOCK_DIALOG_ERROR', 'STOCK_DIALOG_INFO', + 'STOCK_DIALOG_QUESTION', 'STOCK_DIALOG_WARNING', 'STOCK_DIRECTORY', 'STOCK_DISCONNECT', + 'STOCK_DND', 'STOCK_DND_MULTIPLE', 'STOCK_EDIT', 'STOCK_EXECUTE', 'STOCK_FILE', + 'STOCK_FIND', 'STOCK_FIND_AND_REPLACE', 'STOCK_FLOPPY', 'STOCK_GOTO_BOTTOM', + 'STOCK_GOTO_FIRST', 'STOCK_GOTO_LAST', 'STOCK_GOTO_TOP', 'STOCK_GO_BACK', + 'STOCK_GO_DOWN', 'STOCK_GO_FORWARD', 'STOCK_GO_UP', 'STOCK_HARDDISK', + 'STOCK_HELP', 'STOCK_HOME', 'STOCK_INDENT', 'STOCK_INDEX', 'STOCK_ITALIC', + 'STOCK_JUMP_TO', 'STOCK_JUSTIFY_CENTER', 'STOCK_JUSTIFY_FILL', + 'STOCK_JUSTIFY_LEFT', 'STOCK_JUSTIFY_RIGHT', 'STOCK_MEDIA_FORWARD', + 'STOCK_MEDIA_NEXT', 'STOCK_MEDIA_PAUSE', 'STOCK_MEDIA_PLAY', + 'STOCK_MEDIA_PREVIOUS', 'STOCK_MEDIA_RECORD', 'STOCK_MEDIA_REWIND', + 'STOCK_MEDIA_STOP', 'STOCK_MISSING_IMAGE', 'STOCK_NETWORK', 'STOCK_NEW', + 'STOCK_NO', 'STOCK_OK', 'STOCK_OPEN', 'STOCK_PASTE', 'STOCK_PREFERENCES', + 'STOCK_PRINT', 'STOCK_PRINT_PREVIEW', 'STOCK_PROPERTIES', 'STOCK_QUIT', + 'STOCK_REDO', 'STOCK_REFRESH', 'STOCK_REMOVE', 'STOCK_REVERT_TO_SAVED', + 'STOCK_SAVE', 'STOCK_SAVE_AS', 'STOCK_SELECT_COLOR', 'STOCK_SELECT_FONT', + 'STOCK_SORT_ASCENDING', 'STOCK_SORT_DESCENDING', 'STOCK_SPELL_CHECK', + 'STOCK_STOP', 'STOCK_STRIKETHROUGH', 'STOCK_UNDELETE', 'STOCK_UNDERLINE', + 'STOCK_UNDO', 'STOCK_UNINDENT', 'STOCK_YES', 'STOCK_ZOOM_100', + 'STOCK_ZOOM_FIT', 'STOCK_ZOOM_IN', 'STOCK_ZOOM_OUT', + 'terp-account', 'terp-crm', 'terp-mrp', 'terp-product', 'terp-purchase', + 'terp-sale', 'terp-tools', 'terp-administration', 'terp-hr', 'terp-partner', + 'terp-project', 'terp-report', 'terp-stock', 'terp-calendar', 'terp-graph' +]; +openerp.web.ViewEditor.property_widget = new openerp.web.Registry({ + 'boolean' : 'openerp.web.ViewEditor.FieldBoolean', + 'seleciton_multi' : 'openerp.web.ViewEditor.FieldSelectMulti', + 'selection' : 'openerp.web.ViewEditor.FieldSelect', + 'char' : 'openerp.web.ViewEditor.FieldChar', + 'float' : 'openerp.web.ViewEditor.FieldFloat', }); }; diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 9bd1916d714..ced99bea7c2 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -107,7 +107,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView# this.$form_header.find('button.oe_form_button_delete').click(this.on_button_delete); this.$form_header.find('button.oe_form_button_toggle').click(this.on_toggle_readonly); - if (this.options.sidebar && this.options.sidebar_id) { + if (!this.sidebar && this.options.sidebar && this.options.sidebar_id) { this.sidebar = new openerp.web.Sidebar(this, this.options.sidebar_id); this.sidebar.start(); this.sidebar.do_unfold(); @@ -273,6 +273,10 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView# if (field in argument_replacement) { return argument_replacement[field](i); } + // literal number + if (/^-?\d+(\.\d+)?$/.test(field)) { + return Number(field); + } // form field if (self.fields[field]) { var value = self.fields[field].get_on_change_value(); @@ -951,8 +955,9 @@ openerp.web.form.WidgetFrame = openerp.web.form.Widget.extend({ var type = {}; if (node.tag == 'field') { type = this.view.fields_view.fields[node.attrs.name] || {}; - if (node.attrs.widget == 'statusbar') { + if (node.attrs.widget == 'statusbar' && node.attrs.nolabel !== '1') { // This way we can retain backward compatibility between addons and old clients + node.attrs.colspan = (parseInt(node.attrs.colspan, 10) || 1) + 1; node.attrs.nolabel = '1'; } } @@ -985,7 +990,7 @@ openerp.web.form.WidgetFrame = openerp.web.form.Widget.extend({ }); openerp.web.form.WidgetGroup = openerp.web.form.WidgetFrame.extend({ - template: 'WidgetGroup', + template: 'WidgetGroup' }), openerp.web.form.WidgetNotebook = openerp.web.form.Widget.extend({ diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index 728b090d679..53c8d634ad1 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -661,8 +661,8 @@ openerp.web.ListView = openerp.web.View.extend( /** @lends openerp.web.ListView# * * @param {Number} count number of columns to add * @param {Object} options - * @param {"before"|"after"} [position="after"] insertion position for the new columns - * @param {Object} [except] content row to not pad + * @param {"before"|"after"} [options.position="after"] insertion position for the new columns + * @param {Object} [options.except] content row to not pad */ pad_columns: function (count, options) { options = options || {}; diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js index dba0a1abba4..f6b7f85dee1 100644 --- a/addons/web/static/src/js/view_list_editable.js +++ b/addons/web/static/src/js/view_list_editable.js @@ -5,6 +5,7 @@ openerp.web.list_editable = function (openerp) { var KEY_RETURN = 13, KEY_ESCAPE = 27; + var QWeb = openerp.web.qweb; // editability status of list rows openerp.web.ListView.prototype.defaults.editable = null; @@ -350,6 +351,19 @@ openerp.web.list_editable = function (openerp) { new_record: function () { this.dataset.index = null; this.render_row_as_form(); + }, + render_record: function (record) { + var index = this.records.indexOf(record); + // FIXME: context dict should probably be extracted cleanly + return QWeb.render('ListView.row', { + columns: this.columns, + options: this.options, + record: record, + row_parity: (index % 2 === 0) ? 'even' : 'odd', + view: this.view, + render_cell: $.proxy(this, 'render_cell'), + edited: !!this.edition_form + }); } }); if (!openerp.web.list) { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 4fe179fb70f..466e3c9c5c9 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -360,6 +360,10 @@
    • +
  • + + +
    • LOGOUT @@ -625,18 +629,9 @@ - - - - - - - - - - - - + + + Save + + + + + + + + + $(document.createElement('t')) @@ -1392,51 +1399,70 @@ - - - - - - - -
    - - - -
    - - - - - - - - - - -
    - - - - - - - - - -
    - - - - - - - + + + + + + + + +
    + + + + + +
    + + + + + + + + + + +
    + + + + + + + + + +
    + + + + + + + + + + + + + + + + Export @@ -1684,4 +1710,4 @@
    - + \ No newline at end of file diff --git a/addons/web/static/test/onchange.js b/addons/web/static/test/onchange.js index 9f047f33d93..8074c755bd3 100644 --- a/addons/web/static/test/onchange.js +++ b/addons/web/static/test/onchange.js @@ -62,4 +62,13 @@ $(document).ready(function () { var result2 = f.parse_on_change("on_str('foo')", {}); deepEqual(result2.args, ['foo']); }); + test('Literal number', function () { + var f = make_form(); + var result = f.parse_on_change('on_str(42)', {}); + deepEqual(result.args, [42]); + var result2 = f.parse_on_change("on_str(-25)", {}); + deepEqual(result2.args, [-25]); + var result3 = f.parse_on_change("on_str(25.02)", {}); + deepEqual(result3.args, [25.02]); + }); }); diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index 157abb3e7ba..deba1529aa3 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -521,10 +521,13 @@ openerp.web_dashboard.ApplicationTiles = openerp.web.View.extend({ run_configuration_wizards: function () { var self = this; new openerp.web.DataSet(this, 'res.config').call('start', [[]], function (action) { - $.unblockUI(); self.widget_parent.widget_parent.do_action(action, function () { openerp.webclient.do_reload(); }); + self.$element.empty(); + self.do_display_root_menu().then(function () { + $.unblockUI(); + }); }); } }); diff --git a/addons/web_process/static/src/js/process.js b/addons/web_process/static/src/js/process.js index f7497773645..52f6ab1a674 100644 --- a/addons/web_process/static/src/js/process.js +++ b/addons/web_process/static/src/js/process.js @@ -303,7 +303,7 @@ openerp.web_process = function (openerp) { pager: false } }); - }, + } }); }; // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax: