pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] from trunk-website-al

Browse Source 
bzr revid: xmo@openerp.com-20130812075650-sv5v98kuuifaog2z
This commit is contained in:
Xavier Morel
2013-08-12 09:56:50 +02:00
parent db5e36efa3 fcdbfe364d
commit 212f088aea
5 changed files with 106 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/addons/base/base_demo.xml
+1
View File
@@ -14,6 +14,7 @@
<field name="street">1725 Slough Ave.</field>
<field name="city">Scranton</field>
<field name="zip">18540</field>
<field name="country_id" ref="us"/>
<field name="phone">+1 555 123 8069</field>
<field name="email">info@example.com</field>
<field name="website">www.example.com</field>
openerp/addons/base/ir/ir_ui_view.py
+2 -2
View File
@@ -74,6 +74,7 @@ class view(osv.osv):
('qweb', 'QWeb')], string='View Type'),
'arch': fields.text('View Architecture', required=True),
'inherit_id': fields.many2one('ir.ui.view', 'Inherited View', ondelete='cascade', select=True),
'inherit_children_ids': fields.one2many('ir.ui.view','inherit_id', 'Inherit Views'),
'field_parent': fields.char('Child Field',size=64),
'xml_id': fields.function(osv.osv.get_xml_id, type='char', size=128, string="External ID",
help="ID of the view defined in xml file"),
@@ -708,7 +709,6 @@ class view(osv.osv):
# view used as templates
def read_template(self, cr, uid, id_, context=None):
import pprint
try:
id_ = int(id_)
except ValueError:
@@ -770,7 +770,7 @@ class view(osv.osv):
arch = etree.tostring(root, encoding='utf-8', xml_declaration=True)
return arch
engine = qweb.QWebXml(loader)
engine = qweb.QWebXml(loader=loader, undefined_handler=lambda key, v: None)
return engine.render(id_or_xml_id, values)
# maybe used to print the workflow ?
openerp/addons/base/module/module_data.xml
+6
View File
@@ -7,6 +7,7 @@
<field name="visible" eval="0" />
</record>
<record model="ir.module.category" id="module_category_localization">
<field name="name">Localization</field>
<field name="visible" eval="0" />
@@ -113,6 +114,11 @@
<field name="sequence">15</field>
</record>
<record model="ir.module.category" id="module_category_website">
<field name="name">Website</field>
<field name="sequence">16</field>
</record>
<record model="ir.module.category" id="module_category_administration">
<field name="name">Administration</field>
<field name="sequence">100</field>
openerp/tools/convert.py
+16 -5
View File
@@ -846,9 +846,12 @@ form: module.record_id""" % (xml_id,)
if '.' in tpl_id:
module, tpl_id = tpl_id.split('.', 1)
# set the full template name for qweb <module>.<id>
el.set('t-name', '%s.%s' % (module, tpl_id))
if not (el.get('inherit_id') or el.get('inherit_option_id')):
el.set('t-name', '%s.%s' % (module, tpl_id))
el.tag = 't'
else:
el.tag = 'data'
el.attrib.pop('id', None)
el.tag = 't'
record_attrs = {
'id': tpl_id,
@@ -858,10 +861,18 @@ form: module.record_id""" % (xml_id,)
if att in el.keys():
record_attrs[att] = el.attrib.pop(att)
Field = builder.E.field
name = el.get('name', tpl_id)
record = etree.Element('record', attrib=record_attrs)
record.append(builder.E.field(tpl_id, name='name'))
record.append(builder.E.field("qweb", name='type'))
record.append(builder.E.field(el, name="arch", type="xml"))
record.append(Field(name, name='name'))
record.append(Field("qweb", name='type'))
record.append(Field(el, name="arch", type="xml"))
for field_name in ('inherit_id','inherit_option_id'):
if el.get(field_name):
record.append(Field(
field_name, el.attrib.pop(field_name, None)))
return self._tag_record(cr, record, data_node)
def id_get(self, cr, id_str):
openerp/tools/qweb.py
+81 -60
View File
@@ -1,5 +1,6 @@
import cgi
import logging
import re
import types
#from openerp.tools.safe_eval import safe_eval as eval
@@ -9,49 +10,41 @@ import xml.dom.minidom
_logger = logging.getLogger(__name__)
class QWebEval(object):
def __init__(self, data):
self.data = data
class QWebContext(dict):
def __init__(self, data, undefined_handler=None):
self.undefined_handler = undefined_handler
d = {
'True': True,
'False': False,
'None': None,
'str': str,
'globals': locals,
'locals': locals,
'bool': bool,
'dict': dict,
'list': list,
'tuple': tuple,
'map': map,
'abs': abs,
'min': min,
'max': max,
'reduce': reduce,
'filter': filter,
'round': round,
'len': len,
'set': set
}
d.update(data)
dict.__init__(self, d)
self['defined'] = lambda key: key in self
def __getitem__(self, expr):
if expr in self.data:
return self.data[expr]
r = ''
try:
r = eval(expr, self.data)
except NameError:
pass
except AttributeError:
pass
except Exception:
_logger.exception('invalid expression: %r', expr)
self.data.pop('__builtins__', None)
return r
def eval_object(self, expr):
return self[expr]
def eval_str(self, expr):
if expr == "0":
return self.data.get(0, '')
if isinstance(self[expr], unicode):
return self[expr].encode("utf8")
return str(self[expr])
def eval_format(self, expr):
try:
return str(expr % self)
except:
return "qweb: format error '%s' " % expr
# if isinstance(r,unicode):
# return r.encode("utf8")
def eval_bool(self, expr):
if self.eval_object(expr):
return 1
def __getitem__(self, key):
if key in self:
return self.get(key)
elif not self.undefined_handler:
raise NameError("QWeb: name %r is not defined while rendering template %r" % (key, self.get('__template__')))
else:
return 0
return self.get(key, self.undefined_handler(key, self))
class QWebXml(object):
"""QWeb Xml templating engine
@@ -69,13 +62,15 @@ class QWebXml(object):
"""
def __init__(self, loader):
def __init__(self, loader=None, undefined_handler=None):
self.loader = loader
self.undefined_handler = undefined_handler
self.node = xml.dom.Node
self._t = {}
self._render_tag = {}
self._void_elements = set(['area','base','br','col','embed','hr','img','input','keygen',
'link','menuitem','meta','param','source','track','wbr']);
self._format_regex = re.compile('#\{(.*?)\}')
self._void_elements = set(['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'keygen',
'link', 'menuitem', 'meta', 'param', 'source', 'track', 'wbr'])
prefix = 'render_tag_'
for i in [j for j in dir(self) if j.startswith(prefix)]:
name = i[len(prefix):].replace('_', '-')
@@ -98,34 +93,61 @@ class QWebXml(object):
else:
dom = xml.dom.minidom.parse(x)
for n in dom.documentElement.childNodes:
if n.nodeName == "t":
if n.getAttribute('t-name'):
self._t[str(n.getAttribute("t-name"))] = n
def get_template(self, name):
if name in self._t:
return self._t[name]
else:
elif self.loader:
xml = self.loader(name)
self.add_template(xml)
if name in self._t:
return self._t[name]
raise KeyError('qweb: template "%s" not found' % name)
def eval(self, expr, v):
try:
return eval(expr, None, v)
except Exception:
raise SyntaxError("QWeb: invalid expression %r while rendering template '%s'" % (expr, v.get('__template__')))
def eval_object(self, expr, v):
return QWebEval(v).eval_object(expr)
return self.eval(expr, v)
def eval_str(self, expr, v):
return QWebEval(v).eval_str(expr)
if expr == "0":
return v.get(0, '')
val = self.eval(expr, v)
if isinstance(val, unicode):
return val.encode("utf8")
return str(val)
def eval_format(self, expr, v):
return QWebEval(v).eval_format(expr)
use_native = True
for m in self._format_regex.finditer(expr):
use_native = False
expr = expr.replace(m.group(), self.eval_str(m.groups()[0], v))
if not use_native:
return expr
else:
try:
return str(expr % v)
except:
raise Exception("QWeb: format error '%s' " % expr)
def eval_bool(self, expr, v):
return QWebEval(v).eval_bool(expr)
val = self.eval(expr, v)
if val:
return 1
else:
return 0
def render(self, tname, v=None, out=None):
if v is None:
v = {}
v['__template__'] = tname
v = QWebContext(v, self.undefined_handler)
return self.render_node(self.get_template(tname), v)
def render_node(self, e, v):
@@ -203,26 +225,26 @@ class QWebXml(object):
# Tags
def render_tag_raw(self, e, t_att, g_att, v):
inner = self.eval_str(t_att["raw"], v)
return self.render_element(e, t_att, g_att, v, inner)
return self.render_element(e, t_att, g_att, v, inner)
def render_tag_rawf(self, e, t_att, g_att, v):
inner = self.eval_format(t_att["rawf"], v)
return self.render_element(e, t_att, g_att, v, inner)
return self.render_element(e, t_att, g_att, v, inner)
def render_tag_esc(self, e, t_att, g_att, v):
inner = cgi.escape(self.eval_str(t_att["esc"], v))
return self.render_element(e, t_att, g_att, v, inner)
return self.render_element(e, t_att, g_att, v, inner)
def render_tag_escf(self, e, t_att, g_att, v):
inner = cgi.escape(self.eval_format(t_att["escf"], v))
return self.render_element(e, t_att, g_att, v, inner)
return self.render_element(e, t_att, g_att, v, inner)
def render_tag_foreach(self, e, t_att, g_att, v):
expr = t_att["foreach"]
enum = self.eval_object(expr, v)
if enum is not None:
var = t_att.get('as', expr).replace('.', '_')
d = v.copy()
d = QWebContext(v.copy(), self.undefined_handler)
size = -1
if isinstance(enum, types.ListType):
size = len(enum)
@@ -265,13 +287,15 @@ class QWebXml(object):
if "import" in t_att:
d = v
else:
d = v.copy()
d = QWebContext(v.copy(), self.undefined_handler)
d[0] = self.render_element(e, t_att, g_att, d)
return self.render(t_att["call"], d)
def render_tag_set(self, e, t_att, g_att, v):
if "value" in t_att:
v[t_att["set"]] = self.eval_object(t_att["value"], v)
elif "valuef" in t_att:
v[t_att["set"]] = self.eval_format(t_att["valuef"], v)
else:
v[t_att["set"]] = self.render_element(e, t_att, g_att, v)
return ""
@@ -288,9 +312,6 @@ class QWebXml(object):
if field_type == 'many2one':
field_data = record.read([field])[0].get(field)
inner = field_data and field_data[1] or ""
#field = getattr(record, field)
#if field:
# inner = field.name_get()[0][1] or ""
else:
inner = getattr(record, field) or ""
if isinstance(inner, types.UnicodeType):
@@ -310,6 +331,6 @@ class QWebXml(object):
except AttributeError:
_logger.warning("t-field no field %s for model %s", field, record._model._name)
return self.render_element(e, t_att, g_att, v, str(inner))
return self.render_element(e, t_att, g_att, v, str(inner))
# leave this, al.