tryton-do/tryton
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

* menuitem import : if a menuitem has no name, the name of the action is used.

Browse Source 
* updated xml files to use this feature instead of rely on the "string path" (ie name="parent/menu name")
This commit is contained in:
Bertrand Chenal
2008-01-04 00:06:13 +01:00
parent fb6b784a6c
commit 45a7fbc474
17 changed files with 42 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trytond/ir/actions.xml
+5 -5
View File
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<terp>
<data>
<menuitem name="Administration/IR/Actions" id="menu_actions"/>
<menuitem name="Actions" id="menu_actions" parent_id="ir.menu_ir"/>
<record model="ir.ui.view" id="actions_actions_view_form">
<field name="name">ir.actions.actions.form</field>
<field name="model">ir.actions.actions</field>
@@ -58,7 +58,7 @@
<field name="view_id" ref="actions_actions_view_form"/>
<field name="act_window_id" ref="act_actions_actions_form"/>
</record>
<menuitem name="Administration/IR/Actions/"
<menuitem parent_id="menu_actions"
action="act_actions_actions_form" id="menu_actions_actions"/>
<record model="ir.ui.view" id="actions_report_view_form">
<field name="name">ir.actions.report.form</field>
@@ -110,7 +110,7 @@
<field name="view_id" ref="actions_report_view_form"/>
<field name="act_window_id" ref="act_actions_report_form"/>
</record>
<menuitem name="Administration/IR/Actions/"
<menuitem parent_id="menu_actions"
action="act_actions_report_form" id="menu_actions_report_form"/>
<record model="ir.ui.view" id="actions_act_window_view_form">
<field name="name">ir.actions.act_window.form</field>
@@ -182,7 +182,7 @@
<field name="view_id" ref="actions_act_window_view_form"/>
<field name="act_window_id" ref="act_actions_act_window_form"/>
</record>
<menuitem name="Administration/IR/Actions/"
<menuitem parent_id="menu_actions"
action="act_actions_act_window_form" id="menu_actions_act_window"/>
<record model="ir.ui.view" id="actions_wizard_view_form">
<field name="name">ir.actions.wizard.form</field>
@@ -234,7 +234,7 @@
<field name="view_id" ref="actions_wizard_view_form"/>
<field name="act_window_id" ref="act_actions_wizard_form"/>
</record>
<menuitem name="Administration/IR/Actions/"
<menuitem parent_id="menu_actions"
action="act_actions_wizard_form" id="menu_actions_wizard"/>
</data>
</terp>
trytond/ir/attachment.xml
+1 -1
View File
@@ -54,7 +54,7 @@
<field name="view_id" ref="attachment_view_form"/>
<field name="act_window_id" ref="act_attachment_form"/>
</record>
<menuitem name="Administration/IR/Attachments"
<menuitem name="Attachments" parent_id="ir.menu_ir"
action="act_attachment_form" id="menu_attachment_form"/>
</data>
</terp>
trytond/ir/cron.xml
+1 -1
View File
@@ -64,7 +64,7 @@
<field name="view_id" ref="cron_view_form"/>
<field name="act_window_id" ref="act_cron_form"/>
</record>
<menuitem name="Administration/IR/"
<menuitem parent_id="ir.menu_ir"
action="act_cron_form" id="menu_cron_form"/>
</data>
</terp>
trytond/ir/exports.xml
+1 -1
View File
@@ -48,7 +48,7 @@
<field name="view_id" ref="exports_view_form"/>
<field name="act_window_id" ref="act_exports_form"/>
</record>
<menuitem name="Administration/IR/"
<menuitem parent_id="ir.menu_ir"
action="act_exports_form" id="menu_exports_form"/>
</data>
</terp>
trytond/ir/ir.xml
+1 -1
View File
@@ -2,6 +2,6 @@
<terp>
<data>
<menuitem name="Administration" id="menu_administration"/>
<menuitem name="Administration/IR" id="menu_ir"/>
<menuitem name="IR" id="menu_ir" parent_id="menu_administration"/>
</data>
</terp>
trytond/ir/model.xml
+3 -3
View File
@@ -57,7 +57,7 @@
<field name="view_id" ref="model_view_form"/>
<field name="act_window_id" ref="act_model_form"/>
</record>
<menuitem name="Administration/IR/"
<menuitem parent_id="ir.menu_ir"
action="act_model_form" id="menu_model_form"/>
<record model="ir.ui.view" id="model_fields_view_form">
<field name="name">ir.model.fields.form</field>
@@ -107,7 +107,7 @@
<field name="view_id" ref="model_fields_view_form"/>
<field name="act_window_id" ref="act_model_fields_form"/>
</record>
<menuitem name="Administration/IR/"
<menuitem parent_id="ir.menu_ir"
action="act_model_fields_form" id="model_model_fields_form"/>
<record model="ir.ui.view" id="model_access_view_tree">
<field name="name">ir.model.access.tree</field>
@@ -161,7 +161,7 @@
<field name="view_id" ref="model_access_view_form"/>
<field name="act_window_id" ref="act_model_access_form"/>
</record>
<menuitem name="Administration/IR/"
<menuitem parent_id="ir.menu_ir"
action="act_model_access_form" id="menu_model_access_form"/>
</data>
trytond/ir/property.xml
+2 -2
View File
@@ -53,7 +53,7 @@
<field name="view_id" ref="property_view_form"/>
<field name="act_window_id" ref="act_property_form_default"/>
</record>
<menuitem name="Administration/IR/"
<menuitem parent_id="ir.menu_ir"
action="act_property_form_default" id="menu_property_form"/>
<record model="ir.actions.act_window" id="act_property_form">
<field name="name">Properties</field>
@@ -75,7 +75,7 @@
<field name="view_id" ref="property_view_form"/>
<field name="act_window_id" ref="act_property_form"/>
</record>
<menuitem name="Administration/IR/"
<menuitem parent_id="ir.menu_ir"
action="act_property_form" id="menu_property_form"/>
</data>
</terp>
trytond/ir/rule.xml
+1 -1
View File
@@ -55,7 +55,7 @@
<field name="view_id" ref="rule_group_view_form"/>
<field name="act_window_id" ref="act_rule_group_form"/>
</record>
<menuitem name="Administration/IR/"
<menuitem parent_id="ir.menu_ir"
action="act_rule_group_form" id="menu_rule_group_form"/>
<record model="ir.ui.view" id="rule_view_form">
<field name="name">ir.rule.form</field>
trytond/ir/sequence.xml
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<terp>
<data>
<menuitem name="Administration/IR/Sequences" id="menu_sequence"/>
<menuitem name="Sequences" parent_id="ir.menu_ir" id="menu_sequence"/>
<record model="ir.ui.view" id="sequence_view_form">
<field name="name">ir.sequence.form</field>
<field name="model">ir.sequence</field>
trytond/ir/translation.xml
+1 -1
View File
@@ -53,7 +53,7 @@
<field name="view_id" ref="translation_view_form"/>
<field name="act_window_id" ref="act_translation_form"/>
</record>
<menuitem name="Administration/IR/Translations"
<menuitem name="Translations" parent_id="ir.menu_ir"
action="act_translation_form" id="menu_translation_form"/>
</data>
</terp>
trytond/ir/values.xml
+1 -1
View File
@@ -57,7 +57,7 @@
<field name="view_id" ref="values_view_form"/>
<field name="act_window_id" ref="act_values_form"/>
</record>
<menuitem name="Administration/IR/"
<menuitem parent_id="ir.menu_ir"
action="act_values_form" id="menu_values_form"/>
</data>
</terp>
trytond/res/lang.xml
+1 -1
View File
@@ -34,7 +34,7 @@
<field name="view_id" ref="lang_view_tree"/>
<field name="act_window_id" ref="act_lang_form"/>
</record>
<menuitem name="Administration/Res/"
<menuitem parent_id="res.menu_res"
action="act_lang_form" id="menu_lang_form"/>
</data>
</terp>
trytond/res/request.xml
+1 -1
View File
@@ -83,7 +83,7 @@
<field name="view_id" ref="request_view_form"/>
<field name="act_window_id" ref="act_request_form"/>
</record>
<menuitem name="Administration/Res/"
<menuitem parent_id="res.menu_res"
action="act_request_form" id="menu_request_form"/>
<record model="ir.ui.view" id="request_link_view_form">
<field name="name">res.request.link.form</field>
trytond/res/res.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<terp>
<data>
<menuitem name="Administration/Res" id="menu_res"/>
<menuitem name="Res" id="menu_res" parent_id="ir.menu_administration"/>
</data>
</terp>
trytond/res/users.xml
+4 -4
View File
@@ -77,7 +77,7 @@
<field name="view_id" ref="user_view_form"/>
<field name="act_window_id" ref="act_user_form"/>
</record>
<menuitem name="Administration/Res/"
<menuitem parent_id="res.menu_res"
action="act_user_form" id="menu_user_form"/>
<record model="ir.ui.view" id="group_view_form">
<field name="name">res.group.form</field>
@@ -133,7 +133,7 @@
<field name="view_id" ref="group_view_form"/>
<field name="act_window_id" ref="act_group_form"/>
</record>
<menuitem name="Administration/Res/"
<menuitem parent_id="res.menu_res"
action="act_group_form" id="menu_group_form"/>
<record model="ir.ui.view" id="role_view_form">
<field name="name">res.role.form</field>
@@ -194,9 +194,9 @@
<field name="view_id" ref="role_view_tree"/>
<field name="act_window_id" ref="act_role_tree"/>
</record>
<menuitem name="Administration/Res/"
<menuitem parent_id="res.menu_res"
action="act_role_form" id="menu_role_form"/>
<menuitem name="Administration/Res/"
<menuitem parent_id="res.menu_res"
action="act_role_tree" id="menu_role_tree"/>
</data>
</terp>
trytond/tools/convert.py
+11 -6
View File
@@ -770,13 +770,11 @@ def convert_xml_import_dom(cursor, module, xmlstream, idref=None, mode='init',
#$$
# Notes:
# - classe monolythique vs instancier des sous-classe par type de record
# (que l'on re-reference a la volee des qu'on lit le debut du record).
# - utilser des pointeur de fct plutot que que inTitle=1
# - analyser le code _update, source d'amelioration
# - ajouter un handler d'exception
# - faire un cache en debut de traitement : {xml_id: (db_id, model)}
# - prevoir du cache sur les action pour booster la creation des menuitems
# tuto : http://pyxml.sourceforge.net/topics/howto/node14.html
from xml import sax
@@ -820,10 +818,17 @@ class MenuitemTagHandler:
if values.get('action') :
type_attr = attributes.get('type', 'act_window').encode('utf8')
action_id = self.mh.get_id(values['action'])
values['action'] = "ir.actions.%s,%d" %\
(type_attr, self.mh.get_id(values['action']))
(type_attr, action_id)
if not values.get('name'):
res = self.mh.pool.get('ir.actions.act_window').read(
self.mh.cursor, self.mh.user, action_id, ['name'])
values['name'] = res['name']
print values
self.values = values
trytond/workflow/workflow.xml
+6 -6
View File
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<terp>
<data>
<menuitem name="Administration/Workflow" id="menu_workflow"/>
<menuitem name="Workflow" id="menu_workflow" parent_id="ir.menu_administration"/>
<record model="ir.ui.view" id="workflow_view_form">
<field name="name">workflow.form</field>
<field name="model">workflow</field>
@@ -51,7 +51,7 @@
<field name="view_id" ref="workflow_view_form"/>
<field name="act_window_id" ref="act_workflow_form"/>
</record>
<menuitem name="Administration/Workflow/"
<menuitem parent_id="menu_workflow"
action="act_workflow_form" id="menu_workflow_form"/>
<record model="ir.ui.view" id="activity_view_form">
<field name="name">workflow.activity.form</field>
@@ -133,7 +133,7 @@
<field name="view_id" ref="activity_view_form"/>
<field name="act_window_id" ref="act_activity_form"/>
</record>
<menuitem name="Administration/Workflow/"
<menuitem parent_id="menu_workflow"
action="act_activity_form" id="menu_activity_form"/>
<record model="ir.ui.view" id="transition_view_form">
<field name="name">workflow.transition.form</field>
@@ -190,7 +190,7 @@
<field name="view_id" ref="transition_view_form"/>
<field name="act_window_id" ref="act_transition_form"/>
</record>
<menuitem name="Administration/Workflow/"
<menuitem parent_id="menu_workflow"
action="act_transition_form" id="menu_transition_form"/>
<record model="ir.ui.view" id="instance_view_form">
<field name="name">workflow.instance.form</field>
@@ -236,7 +236,7 @@
<field name="view_id" ref="instance_view_tree"/>
<field name="act_window_id" ref="act_instance_form"/>
</record>
<menuitem name="Administration/Workflow/"
<menuitem parent_id="menu_workflow"
action="act_instance_form" id="menu_instance_form"/>
<record model="ir.ui.view" id="workitem_view_form">
<field name="name">workflow.workitem.form</field>
@@ -287,7 +287,7 @@
<field name="view_id" ref="workitem_view_form"/>
<field name="act_window_id" ref="act_workitem_form"/>
</record>
<menuitem name="Administration/Workflow/"
<menuitem parent_id="menu_workflow"
action="act_workitem_form" id="menu_workitem_form"/>
</data>
</terp>