KERNEL: fix migration and add id to some menuitem
bzr revid: ced-a2bc9e02a53c059ebac42ddd0f03df3ab78e2261
This commit is contained in:
ced
parent
eabb412da8
commit
7d40a34c73
|
|
@ -217,12 +217,10 @@ def load_module_graph(cr, graph, status={}):
|
|||
cr.execute("update ir_module_module set state='installed', demo=%s where state in ('to upgrade', 'to install') and name=%s", (str(hasattr(package, 'demo')) or package_demo, package.name))
|
||||
cr.commit()
|
||||
statusi+=1
|
||||
cr.commit()
|
||||
|
||||
# pool = osv.osv.FakePool('base')
|
||||
# pool = pooler.get_pool(cr.dbname)
|
||||
# pool.get('ir.model.data')._process_end(cr, 1, package_todo)
|
||||
# cr.commit()
|
||||
pool = pooler.get_pool(cr.dbname)
|
||||
pool.get('ir.model.data')._process_end(cr, 1, package_todo)
|
||||
cr.commit()
|
||||
|
||||
def register_classes():
|
||||
module_list = os.listdir(ad)
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
<field name="res_model">res.lang</field>
|
||||
<field name="view_type">form</field>
|
||||
</record>
|
||||
<menuitem name="Administration/Custom/Interface/Languages" action="action_lang"/>
|
||||
<menuitem name="Administration/Custom/Interface/Languages" action="action_lang" id="menu_action_lang"/>
|
||||
|
||||
<ir_set>
|
||||
<field name="key" eval="'meta'"/>
|
||||
|
|
@ -154,7 +154,7 @@
|
|||
|
||||
# Admin config
|
||||
|
||||
<menuitem name="Administration/Configuration/User" sequence="4"/>
|
||||
<menuitem name="Administration/Configuration/User" sequence="4" id="menu_adm_conf_user"/>
|
||||
|
||||
<record model="ir.actions.act_window" id="open_module_users_list">
|
||||
<field name="name">res.users.list</field>
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="sequence_view"/>
|
||||
</record>
|
||||
<menuitem name="Administration/Custom/Sequences/Sequences" action="ir_sequence_form"/>
|
||||
<menuitem name="Administration/Custom/Sequences/Sequences" action="ir_sequence_form" id="menu_ir_sequence_form"/>
|
||||
|
||||
==========================================================
|
||||
Sequences Types
|
||||
|
|
@ -59,7 +59,7 @@
|
|||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" eval="False"/>
|
||||
</record>
|
||||
<menuitem name="Administration/Custom/Sequences/Sequence Types" action="ir_sequence_type"/>
|
||||
<menuitem name="Administration/Custom/Sequences/Sequence Types" action="ir_sequence_type" id="menu_ir_sequence_type"/>
|
||||
|
||||
==========================================================
|
||||
Actions
|
||||
|
|
@ -71,7 +71,7 @@
|
|||
<field name="res_model">ir.actions.actions</field>
|
||||
<field name="view_type">form</field>
|
||||
</record>
|
||||
<menuitem name="Administration/Custom/Low level/Base/Actions/Actions" action="ir_sequence_actions"/>
|
||||
<menuitem name="Administration/Custom/Low level/Base/Actions/Actions" action="ir_sequence_actions" id="menu_ir_sequence_actions"/>
|
||||
|
||||
<record model="ir.actions.act_window" id="ir_action_execute">
|
||||
<field name="name">ir.actions.execute</field>
|
||||
|
|
@ -79,7 +79,7 @@
|
|||
<field name="res_model">ir.actions.execute</field>
|
||||
<field name="view_type">form</field>
|
||||
</record>
|
||||
<menuitem name="Administration/Custom/Low level/Base/Actions/Execute" action="ir_action_execute"/>
|
||||
<menuitem name="Administration/Custom/Low level/Base/Actions/Execute" action="ir_action_execute" id="menu_ir_action_execute"/>
|
||||
|
||||
<record model="ir.actions.act_window" id="ir_action_group">
|
||||
<field name="name">ir.actions.group</field>
|
||||
|
|
@ -87,7 +87,7 @@
|
|||
<field name="res_model">ir.actions.group</field>
|
||||
<field name="view_type">form</field>
|
||||
</record>
|
||||
<menuitem name="Administration/Custom/Low level/Base/Actions/Group" action="ir_action_group"/>
|
||||
<menuitem name="Administration/Custom/Low level/Base/Actions/Group" action="ir_action_group" id="menu_ir_action_group"/>
|
||||
|
||||
<record model="ir.actions.act_window" id="ir_action_report_custom">
|
||||
<field name="name">ir.actions.report.custom</field>
|
||||
|
|
@ -95,7 +95,7 @@
|
|||
<field name="res_model">ir.actions.report.custom</field>
|
||||
<field name="view_type">form</field>
|
||||
</record>
|
||||
<menuitem name="Administration/Custom/Low level/Base/Actions/Report Custom" action="ir_action_report_custom"/>
|
||||
<menuitem name="Administration/Custom/Low level/Base/Actions/Report Custom" action="ir_action_report_custom" id="menu_ir_action_report_custom"/>
|
||||
|
||||
<record model="ir.actions.act_window" id="ir_action_report_xml">
|
||||
<field name="name">ir.actions.report.xml</field>
|
||||
|
|
@ -103,7 +103,7 @@
|
|||
<field name="res_model">ir.actions.report.xml</field>
|
||||
<field name="view_type">form</field>
|
||||
</record>
|
||||
<menuitem name="Administration/Custom/Low level/Base/Actions/Report Xml" action="ir_action_report_xml"/>
|
||||
<menuitem name="Administration/Custom/Low level/Base/Actions/Report Xml" action="ir_action_report_xml" id="menu_ir_action_report_xml"/>
|
||||
|
||||
<record model="ir.ui.view" id="view_window_action_tree">
|
||||
<field name="name">ir.actions.windows.tree</field>
|
||||
|
|
@ -142,7 +142,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_window_action_form"/>
|
||||
</record>
|
||||
<menuitem name="Administration/Custom/Low level/Base/Actions/Open Window" action="ir_action_window"/>
|
||||
<menuitem name="Administration/Custom/Low level/Base/Actions/Open Window" action="ir_action_window" id="menu_ir_action_window"/>
|
||||
|
||||
<record model="ir.actions.act_window" id="ir_action_wizard">
|
||||
<field name="name">ir.actions.wizard</field>
|
||||
|
|
@ -150,7 +150,7 @@
|
|||
<field name="res_model">ir.actions.wizard</field>
|
||||
<field name="view_type">form</field>
|
||||
</record>
|
||||
<menuitem name="Administration/Custom/Low level/Base/Actions/Wizard" action="ir_action_wizard"/>
|
||||
<menuitem name="Administration/Custom/Low level/Base/Actions/Wizard" action="ir_action_wizard" id="menu_ir_action_wizard"/>
|
||||
|
||||
==========================================================
|
||||
Companies
|
||||
|
|
@ -163,14 +163,14 @@
|
|||
<field name="domain">[('parent_id','=',False)]</field>
|
||||
<field name="view_type">tree</field>
|
||||
</record>
|
||||
<menuitem name="Administration/Users/Company Structure" action="action_res_company_tree"/>
|
||||
<menuitem name="Administration/Users/Company Structure" action="action_res_company_tree" id="menu_action_res_company_tree"/>
|
||||
<record model="ir.actions.act_window" id="action_res_company_form">
|
||||
<field name="name">res.groups</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">res.company</field>
|
||||
<field name="view_type">form</field>
|
||||
</record>
|
||||
<menuitem name="Administration/Users/Company Structure/Define Companies" action="action_res_company_form"/>
|
||||
<menuitem name="Administration/Users/Company Structure/Define Companies" action="action_res_company_form" id="menu_action_res_company_form"/>
|
||||
|
||||
==========================================================
|
||||
User Roles
|
||||
|
|
@ -183,7 +183,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_users_form"/>
|
||||
</record>
|
||||
<menuitem name="Administration/Users/Users" action="action_res_users"/>
|
||||
<menuitem name="Administration/Users/Users" action="action_res_users" id="menu_action_res_users"/>
|
||||
<record model="ir.actions.act_window" id="action_res_users_my">
|
||||
<field name="name">res.users</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
|
|
@ -193,7 +193,7 @@
|
|||
<field name="domain">[('id','=',uid)]</field>
|
||||
<field name="view_id" ref="view_users_form_simple_modif"/>
|
||||
</record>
|
||||
<menuitem name="Administration/Users/Users/My password" action="action_res_users_my"/>
|
||||
<menuitem name="Administration/Users/Users/My password" action="action_res_users_my" id="menu_action_res_users_my"/>
|
||||
|
||||
<record model="ir.actions.act_window" id="action_res_groups">
|
||||
<field name="name">res.groups</field>
|
||||
|
|
@ -201,7 +201,7 @@
|
|||
<field name="res_model">res.groups</field>
|
||||
<field name="view_type">form</field>
|
||||
</record>
|
||||
<menuitem name="Administration/Users/Groups" action="action_res_groups"/>
|
||||
<menuitem name="Administration/Users/Groups" action="action_res_groups" id="menu_action_res_groups"/>
|
||||
|
||||
<record model="ir.ui.view" id="view_roles_form">
|
||||
<field name="name">res.roles.form</field>
|
||||
|
|
@ -232,14 +232,14 @@
|
|||
<field name="view_type">tree</field>
|
||||
<field name="domain" eval="[('parent_id','=',False)]"/>
|
||||
</record>
|
||||
<menuitem name="Administration/Users/Roles structure" action="action_res_roles"/>
|
||||
<menuitem name="Administration/Users/Roles structure" action="action_res_roles" id="menu_action_res_roles"/>
|
||||
<record model="ir.actions.act_window" id="action_res_roles_form">
|
||||
<field name="name">res.roles.tree</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">res.roles</field>
|
||||
<field name="view_type">form</field>
|
||||
</record>
|
||||
<menuitem name="Administration/Users/Roles structure/Define Roles" action="action_res_roles_form"/>
|
||||
<menuitem name="Administration/Users/Roles structure/Define Roles" action="action_res_roles_form" id="menu_action_res_roles_form"/>
|
||||
|
||||
==========================================================
|
||||
View
|
||||
|
|
@ -267,7 +267,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_view_form"/>
|
||||
</record>
|
||||
<menuitem name="Administration/Custom/Interface/View" action="action_ui_view"/>
|
||||
<menuitem name="Administration/Custom/Interface/View" action="action_ui_view" id="menu_action_ui_view"/>
|
||||
|
||||
==========================================================
|
||||
Attachment
|
||||
|
|
@ -295,7 +295,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_attachment_form"/>
|
||||
</record>
|
||||
<menuitem name="Administration/Custom/Low level/Base/Attachments" action="action_attachment"/>
|
||||
<menuitem name="Administration/Custom/Low level/Base/Attachments" action="action_attachment" id="menu_action_attachment"/>
|
||||
|
||||
==========================================================
|
||||
Report
|
||||
|
|
@ -503,7 +503,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="view_translation_form"/>
|
||||
</record>
|
||||
<menuitem name="Administration/Translations/All terms" action="action_translation"/>
|
||||
<menuitem name="Administration/Translations/All terms" action="action_translation" id="menu_action_translation"/>
|
||||
|
||||
<record model="ir.ui.view" id="view_translation_tree">
|
||||
<field name="name">Translations</field>
|
||||
|
|
@ -559,7 +559,7 @@
|
|||
<field name="view_id" ref="edit_menu_access"/>
|
||||
</record>
|
||||
<menuitem name="Administration/Security/Grant Access to menu"
|
||||
action="grant_menu_access" />
|
||||
action="grant_menu_access" id="menu_grant_menu_access"/>
|
||||
|
||||
<!--
|
||||
=============================================================
|
||||
|
|
@ -611,7 +611,7 @@
|
|||
<field name="view_id" ref="ir_cron_view"/>
|
||||
</record>
|
||||
<menuitem name="Administration/Custom/Low level/Base/Actions/Scheduled Actions"
|
||||
action="ir_cron_act"/>
|
||||
action="ir_cron_act" id="menu_ir_cron_act"/>
|
||||
|
||||
|
||||
<record model="ir.ui.view" id="ir_access_view_tree">
|
||||
|
|
@ -649,7 +649,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="ir_access_view_form"/>
|
||||
</record>
|
||||
<menuitem name="Administration/Security/Access Controls" action="ir_access_act"/>
|
||||
<menuitem name="Administration/Security/Access Controls" action="ir_access_act" id="menu_ir_access_act"/>
|
||||
|
||||
</data>
|
||||
</terp>
|
||||
|
|
|
|||
|
|
@ -198,6 +198,7 @@ class ir_model_data(osv.osv):
|
|||
if xml_id:
|
||||
self.create(cr, uid, {'name':xml_id, 'model':model, 'module':module, 'res_id':res_id, 'noupdate':noupdate})
|
||||
else:
|
||||
if model == 'ir.ui.menu' and not xml_id:
|
||||
if mode=='init' or (mode=='update' and xml_id):
|
||||
res_id = self.pool.get(model).create(cr, uid, values)
|
||||
if xml_id:
|
||||
|
|
@ -262,19 +263,15 @@ class ir_model_data(osv.osv):
|
|||
cr.commit()
|
||||
for (model,id) in self.unlink_mark.keys():
|
||||
if self.pool.get(model):
|
||||
print 'Deleting %s@%s' % (id, model),
|
||||
logger = netsvc.Logger()
|
||||
logger.notifyChannel('init', netsvc.LOG_INFO, 'Deleting %s@%s' % (id, model))
|
||||
try:
|
||||
self.pool.get(model).unlink(cr, uid, [id])
|
||||
if self.unlink_mark[(model,id)]:
|
||||
self.unlink(cr, uid, [self.unlink_mark[(model,id)]])
|
||||
cr.commit()
|
||||
print '... ok'
|
||||
except:
|
||||
print '... ko'
|
||||
print '-'*60
|
||||
print 'WARNING: Could not delete id', id, 'of model', model
|
||||
print '\tThere should be some relation that points to this resource'
|
||||
print '\tYou should manually fix this and restart --update=module'
|
||||
logger.notifyChannel('init', netsvc.LOG_ERROR, 'Could not delete id: %d of model %s\tThere should be some relation that points to this resource\tYou should manually fix this and restart --update=module' % (id, model))
|
||||
return True
|
||||
ir_model_data()
|
||||
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@
|
|||
<menuitem
|
||||
name="Administration/Modules Management/Categories of Modules"
|
||||
action="action_module_category_tree"
|
||||
id="menu_action_module_category_tree"
|
||||
/>
|
||||
|
||||
#
|
||||
|
|
@ -131,7 +132,7 @@
|
|||
<field name="view_mode">tree,form</field>
|
||||
<field name="domain"></field>
|
||||
</record>
|
||||
<menuitem name="Administration/Modules Management/Modules" action="open_module_tree"/>
|
||||
<menuitem name="Administration/Modules Management/Modules" action="open_module_tree" id="menu_module_tree"/>
|
||||
|
||||
<record model="ir.actions.act_window" id="open_module_tree_install">
|
||||
<field name="name">ir.module.module</field>
|
||||
|
|
@ -140,7 +141,7 @@
|
|||
<field name="view_mode">tree,form</field>
|
||||
<field name="domain">[('state','=','installed')]</field>
|
||||
</record>
|
||||
<menuitem name="Administration/Modules Management/Modules/Installed Modules" action="open_module_tree_install"/>
|
||||
<menuitem name="Administration/Modules Management/Modules/Installed Modules" action="open_module_tree_install" id="menu_module_tree_install"/>
|
||||
<record model="ir.actions.act_window" id="open_module_tree_uninstall">
|
||||
<field name="name">ir.module.module</field>
|
||||
<field name="res_model">ir.module.module</field>
|
||||
|
|
@ -148,7 +149,7 @@
|
|||
<field name="view_mode">tree,form</field>
|
||||
<field name="domain">[('state','=','uninstalled')]</field>
|
||||
</record>
|
||||
<menuitem name="Administration/Modules Management/Modules/Uninstalled Modules" action="open_module_tree_uninstall"/>
|
||||
<menuitem name="Administration/Modules Management/Modules/Uninstalled Modules" action="open_module_tree_uninstall" id="menu_module_tree_uninstall"/>
|
||||
<record model="ir.actions.act_window" id="open_module_tree_upgrade">
|
||||
<field name="name">ir.module.module</field>
|
||||
<field name="res_model">ir.module.module</field>
|
||||
|
|
@ -156,7 +157,7 @@
|
|||
<field name="view_mode">tree,form</field>
|
||||
<field name="domain">[('state','<>','uninstalled'),('state','<>','installed'),('state','<>','uninstallable'),]</field>
|
||||
</record>
|
||||
<menuitem name="Administration/Modules Management/Modules/Modules to be installed, upgraded or removed" action="open_module_tree_upgrade"/>
|
||||
<menuitem name="Administration/Modules Management/Modules/Modules to be installed, upgraded or removed" action="open_module_tree_upgrade" id="menu_module_tree_upgrade"/>
|
||||
|
||||
<record model="ir.ui.view" id="repository_form">
|
||||
<field name="name">ir.module.repository.form</field>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
<menuitem name="Partners/Configuration/Partner events/Channels" groups="admin" action="res_partner_canal-act"/>
|
||||
<menuitem name="Partners/Configuration/Partner events/Channels" groups="admin" action="res_partner_canal-act" id="menu_res_partner_canal-act"/>
|
||||
|
||||
<record model="ir.ui.view" id="res_partner_event_type-view">
|
||||
<field name="name">res.partner.event.type.form</field>
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
<menuitem name="Partners/Configuration/Partner events/Active partner events" groups="admin" action="res_partner_event_type-act"/>
|
||||
<menuitem name="Partners/Configuration/Partner events/Active partner events" groups="admin" action="res_partner_event_type-act" id="menu_res_partner_event_type-act"/>
|
||||
|
||||
<record model="ir.ui.view" id="res_partner_som_tree-view">
|
||||
<field name="name">res.partner.som.tree</field>
|
||||
|
|
@ -70,7 +70,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
<menuitem name="Partners/Configuration/Partner events/States of Mind" groups="admin" action="res_partner_som-act"/>
|
||||
<menuitem name="Partners/Configuration/Partner events/States of Mind" groups="admin" action="res_partner_som-act" id="menu_res_partner_som-act"/>
|
||||
|
||||
<record model="ir.ui.view" id="res_partner_event-wopartner-view_form">
|
||||
<field name="name">res.partner.event.form</field>
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
</record>
|
||||
<menuitem name="Partners/Configuration/Localisation/Currencies" action="action_currency_form" sequence="11"/>
|
||||
<menuitem name="Partners/Configuration/Localisation/Currencies" action="action_currency_form" sequence="11" id="menu_action_currency_form"/>
|
||||
|
||||
<menuitem name="Administration/Configuration/Base/Define Currencies" action="action_currency_form" sequence="1" id="menu_currency_def"/>
|
||||
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="res_request-view"/>
|
||||
</record>
|
||||
<menuitem name="Administration/Custom/Low level/Base/Requests/All Requests" action="res_request-act"/>
|
||||
<menuitem name="Administration/Custom/Low level/Base/Requests/All Requests" action="res_request-act" id="menu_res_request_act"/>
|
||||
|
||||
<record model="ir.ui.view" id="res_request_link-view">
|
||||
<field name="name">res.request.link.form</field>
|
||||
|
|
@ -90,7 +90,7 @@
|
|||
<field name="view_type">form</field>
|
||||
<field name="view_id" ref="res_request_link-view"/>
|
||||
</record>
|
||||
<menuitem name="Administration/Custom/Low level/Base/Requests/Request Links" action="res_request_link-act"/>
|
||||
<menuitem name="Administration/Custom/Low level/Base/Requests/Request Links" action="res_request_link-act" id="menu_res_request_link_act"/>
|
||||
|
||||
|
||||
<record model="ir.ui.view" id="res_request_history_tree-view">
|
||||
|
|
|
|||
|
|
@ -83,7 +83,11 @@ cr.commit()
|
|||
# remove old menu #
|
||||
# --------------- #
|
||||
|
||||
cr.execute("delete from ir_ui_menu where (id not in (select parent_id from ir_ui_menu where parent_id is not null)) and (id not in (select res_id from ir_values where model='ir.ui.menu'))")
|
||||
while True:
|
||||
cr.execute("select id from ir_ui_menu where (id not in (select parent_id from ir_ui_menu where parent_id is not null)) and (id not in (select res_id from ir_values where model='ir.ui.menu'))")
|
||||
if not cr.rowcount:
|
||||
break
|
||||
cr.execute("delete from ir_ui_menu where (id not in (select parent_id from ir_ui_menu where parent_id is not null)) and (id not in (select res_id from ir_values where model='ir.ui.menu'))")
|
||||
cr.commit()
|
||||
|
||||
# ----------------------------------------- #
|
||||
|
|
|
|||
|
|
@ -103,6 +103,16 @@ if not cr.rowcount:
|
|||
cr.execute("INSERT INTO ir_module_module (name, state) VALUES ('%s', 'installed')" % module)
|
||||
cr.commit()
|
||||
|
||||
# --------------- #
|
||||
# remove old menu #
|
||||
# --------------- #
|
||||
|
||||
while True:
|
||||
cr.execute("select id from ir_ui_menu where id not in (select parent_id from ir_ui_menu where parent_id is not null) and id not in (select res_id from ir_model_data where model='ir.ui.menu')")
|
||||
if not cr.rowcount:
|
||||
break
|
||||
cr.execute("delete from ir_ui_menu where id not in (select parent_id from ir_ui_menu where parent_id is not null) and id not in (select res_id from ir_model_data where model='ir.ui.menu')")
|
||||
cr.commit()
|
||||
|
||||
# ----------------------------------------------------- #
|
||||
# add some fields (which cannot be added automatically) #
|
||||
|
|
|
|||
Loading…
Reference in New Issue