[IMP] rng: forbid redundant @type for menuitem, now inferred from the action type + minor cleanup
bzr revid: odo@openerp.com-20120822144946-fdsw9ee1ia3nfe86
This commit is contained in:
parent
f7a5eb5d6c
commit
a337ca201d
|
@ -185,7 +185,6 @@
|
||||||
<rng:optional> <rng:attribute name="string"/> </rng:optional>
|
<rng:optional> <rng:attribute name="string"/> </rng:optional>
|
||||||
<rng:optional> <rng:attribute name="sequence"/> </rng:optional>
|
<rng:optional> <rng:attribute name="sequence"/> </rng:optional>
|
||||||
<rng:optional> <rng:attribute name="groups"/> </rng:optional>
|
<rng:optional> <rng:attribute name="groups"/> </rng:optional>
|
||||||
<rng:optional> <rng:attribute name="type"/> </rng:optional>
|
|
||||||
<rng:optional> <rng:attribute name="menu"/> </rng:optional>
|
<rng:optional> <rng:attribute name="menu"/> </rng:optional>
|
||||||
<rng:empty />
|
<rng:empty />
|
||||||
</rng:element>
|
</rng:element>
|
||||||
|
|
|
@ -593,11 +593,11 @@ form: module.record_id""" % (xml_id,)
|
||||||
a_action = rec.get('action','').encode('utf8')
|
a_action = rec.get('action','').encode('utf8')
|
||||||
|
|
||||||
# determine the type of action
|
# determine the type of action
|
||||||
if ('.' in a_action):
|
if '.' in a_action:
|
||||||
# this is an action refering to another module: extract this module's name
|
# action referring to another module
|
||||||
a_action_module, a_action_name = a_action.split('.')
|
a_action_module, a_action_name = a_action.split('.')
|
||||||
else:
|
else:
|
||||||
# this is a local action: fetch the current module's name
|
# local action: use current module
|
||||||
a_action_module = self.module
|
a_action_module = self.module
|
||||||
a_action_name = a_action
|
a_action_name = a_action
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue