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

Set form views default @version="7.0"

This commit is contained in:
Fabien Meghazi 2014-06-11 14:03:20 +02:00
parent 9a60bafd7f
commit ba3ce4753b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1197,7 +1197,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
this.fvg = fvg;
this.version = parseFloat(this.fvg.arch.attrs.version);
if (isNaN(this.version)) {
this.version = 6.1;
this.version = 7.0;
}
},
set_tags_registry: function(tags_registry) {
@ -1209,7 +1209,7 @@ instance.web.form.FormRenderingEngine = instance.web.form.FormRenderingEngineInt
set_widgets_registry: function(widgets_registry) {
this.widgets_registry = widgets_registry;
},
// Backward compatibility tools, current default version: v6.1
// Backward compatibility tools, current default version: v7
process_version: function() {
if (this.version < 7.0) {
this.$form.find('form:first').wrapInner('<group col="4"/>');

4
openerp/addons/base/ir/ir_ui_view.py
View File

@ -39,6 +39,7 @@ from openerp import tools
from openerp.http import request
from openerp.osv import fields, osv, orm
from openerp.tools import graph, SKIPPED_ELEMENT_TYPES
from openerp.tools.parse_version import parse_version
from openerp.tools.safe_eval import safe_eval as eval
from openerp.tools.view_validation import valid_view
from openerp.tools import misc
@ -210,7 +211,8 @@ class view(osv.osv):
view_docs = view_docs[0]
validator = self._relaxng()
for view_arch in view_docs:
if (view_arch.get('version') < '7.0') and validator and not validator.validate(view_arch):
version = view_arch.get('version', '7.0')
if parse_version(version) < parse_version('7.0') and validator and not validator.validate(view_arch):
for error in validator.error_log:
_logger.error(tools.ustr(error))
return False