xrg has proposed merging lp:~openerp-dev/openobject-server/trunk-bug-795453-xrg
into lp:openobject-server.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
Bug #795453 in OpenERP Server: "ir.module: refactor _get_views(),
significantly optimize"
https://bugs.launchpad.net/openobject-server/+bug/795453
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-795453-xrg/+merge/64139
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-795453-xrg/+merge/64139
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-bug-795453-xrg.
=== modified file 'openerp/addons/base/module/module.py'
--- openerp/addons/base/module/module.py 2011-05-11 13:53:32 +0000
+++ openerp/addons/base/module/module.py 2011-06-10 09:47:20 +0000
@@ -97,45 +97,66 @@
view_obj = self.pool.get('ir.ui.view')
report_obj = self.pool.get('ir.actions.report.xml')
menu_obj = self.pool.get('ir.ui.menu')
- mlist = self.browse(cr, uid, ids, context=context)
- mnames = {}
- for m in mlist:
- # skip uninstalled modules below,
- # no data to find anyway
- if m.state in ('installed', 'to upgrade', 'to remove'):
- mnames[m.name] = m.id
- res[m.id] = {
+
+ dmodels = []
+ if field_name is None or 'views_by_module' in field_name:
+ dmodels.append('ir.ui.view')
+ if field_name is None or 'reports_by_module' in field_name:
+ dmodels.append('ir.actions.report.xml')
+ if field_name is None or 'menus_by_module' in field_name:
+ dmodels.append('ir.ui.menu')
+ assert dmodels, "no models for %s" % field_name
+
+ for module_rec in self.browse(cr, uid, ids, context=context):
+ # we loop over the modules, usually this _get_views is only
+ # called for one module at a time
+
+ res[module_rec.id] = {
'menus_by_module':[],
'reports_by_module':[],
'views_by_module': []
}
- if not mnames:
- return res
-
- view_id = model_data_obj.search(cr,uid,[('module','in', mnames.keys()),
- ('model','in',('ir.ui.view','ir.actions.report.xml','ir.ui.menu'))])
- for data_id in model_data_obj.browse(cr,uid,view_id,context):
+ # skip uninstalled modules below,
+ # no data to find anyway
+ if module_rec.state not in ('installed', 'to upgrade', 'to remove'):
+ continue
+
+ # then, search and group ir.model.data records
+ imd_models = dict( [(m,[]) for m in dmodels])
+ imd_ids = model_data_obj.search(cr,uid,[('module','=', module_rec.name),
+ ('model','in',tuple(dmodels))])
+
+ for imd_res in model_data_obj.read(cr, uid, imd_ids, ['model', 'res_id'], context=context):
+ imd_models[imd_res['model']].append(imd_res['res_id'])
+
+ # For each one of the models, get the names of these ids
# We use try except, because views or menus may not exist
try:
- key = data_id.model
- res_mod_dic = res[mnames[data_id.module]]
- if key=='ir.ui.view':
- v = view_obj.browse(cr,uid,data_id.res_id)
- aa = v.inherit_id and '* INHERIT ' or ''
- res_mod_dic['views_by_module'].append(aa + v.name + '('+v.type+')')
- elif key=='ir.actions.report.xml':
- res_mod_dic['reports_by_module'].append(report_obj.browse(cr,uid,data_id.res_id).name)
- elif key=='ir.ui.menu':
- res_mod_dic['menus_by_module'].append(menu_obj.browse(cr,uid,data_id.res_id).complete_name)
+ res_mod_dic = res[module_rec.id]
+ if imd_models.get('ir.ui.view', False):
+ for v in view_obj.browse(cr, uid, imd_models['ir.ui.view'], context=context):
+ aa = v.inherit_id and '* INHERIT ' or ''
+ res_mod_dic['views_by_module'].append(aa + v.name + '('+v.type+')')
+
+ if imd_models.get('ir.actions.report.xml', False):
+ for rx in report_obj.browse(cr,uid, imd_models['ir.actions.report.xml'], context=context):
+ res_mod_dic['reports_by_module'].append(rx.name)
+
+ if imd_models.get('ir.ui.menu', False):
+ for um in menu_obj.browse(cr,uid,imd_models['ir.ui.menu'], context=context):
+ res_mod_dic['menus_by_module'].append(um.complete_name)
except KeyError, e:
self.__logger.warning(
- 'Data not found for reference %s[%s:%s.%s]', data_id.model,
- data_id.res_id, data_id.model, data_id.name, exc_info=True)
+ 'Data not found for items of %s', module_rec.name)
+ pass
+ except AttributeError, e:
+ self.__logger.warning(
+ 'Data not found for items of %s %s', module_rec.name, str(e))
pass
except Exception, e:
- self.__logger.warning('Unknown error while browsing %s[%s]',
- data_id.model, data_id.res_id, exc_info=True)
+ self.__logger.warning('Unknown error while fetching data of %s',
+ module_rec.name, exc_info=True)
pass
for key, value in res.iteritems():
for k, v in res[key].iteritems() :
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
