[IMP] tools.convert,rng: fixed support for <url> tag
bzr revid: odo@openerp.com-20110411083201-2ir0ed4o3xdal6tk
This commit is contained in:
parent
2ad705317c
commit
c262393950
|
@ -188,6 +188,16 @@
|
|||
</rng:element>
|
||||
</rng:define>
|
||||
|
||||
<rng:define name="url">
|
||||
<rng:element name="url">
|
||||
<rng:attribute name="id" />
|
||||
<rng:attribute name="name" />
|
||||
<rng:attribute name="url" />
|
||||
<rng:optional><rng:attribute name="target" /></rng:optional>
|
||||
<rng:empty />
|
||||
</rng:element>
|
||||
</rng:define>
|
||||
|
||||
<rng:define name="act_window">
|
||||
<rng:element name="act_window">
|
||||
<rng:attribute name="id" />
|
||||
|
@ -222,6 +232,7 @@
|
|||
<rng:ref name="delete" />
|
||||
<rng:ref name="wizard" />
|
||||
<rng:ref name="act_window" />
|
||||
<rng:ref name="url" />
|
||||
<rng:ref name="assert" />
|
||||
<rng:ref name="report" />
|
||||
<rng:ref name="workflow" />
|
||||
|
|
|
@ -403,7 +403,7 @@ form: module.record_id""" % (xml_id,)
|
|||
self._remove_ir_values(cr, string, value, model)
|
||||
|
||||
def _tag_url(self, cr, rec, data_node=None):
|
||||
url = rec.get("string",'').encode('utf8')
|
||||
url = rec.get("url",'').encode('utf8')
|
||||
target = rec.get("target",'').encode('utf8')
|
||||
name = rec.get("name",'').encode('utf8')
|
||||
xml_id = rec.get('id','').encode('utf8')
|
||||
|
@ -655,6 +655,12 @@ form: module.record_id""" % (xml_id,)
|
|||
resw = cr.fetchone()
|
||||
if (not values.get('name', False)) and resw:
|
||||
values['name'] = resw[0]
|
||||
elif a_type=='url':
|
||||
a_id = self.id_get(cr, a_action)
|
||||
cr.execute('select name from ir_act_url where id=%s', (int(a_id),))
|
||||
resw = cr.fetchone()
|
||||
if (not values.get('name')) and resw:
|
||||
values['name'] = resw[0]
|
||||
if rec.get('sequence'):
|
||||
values['sequence'] = int(rec.get('sequence'))
|
||||
if rec.get('icon'):
|
||||
|
|
Loading…
Reference in New Issue