summaryrefslogtreecommitdiff
path: root/bin/addons/base/module
diff options
context:
space:
mode:
authorFerdinand Gassauer <ferdinand.gassauer@camptocamp.com>2010-11-23 17:42:55 +0200
committerP. Christeas <p_christ@hol.gr>2010-11-23 17:42:55 +0200
commit09099f1ed8a7f775ca1d9a7f5618c2eb3901e42f (patch)
treea8397c8324e554184f64f92dadd998cfbbde636a /bin/addons/base/module
parentc5b99753eac61a300899430d0b0a7c234f92b7b6 (diff)
module: sorted Features
returns alphabetically sorted Menu,Views,Reports to make these lists readable for humans. bzr revid: p_christ@hol.gr-20101123154255-4iazp4ec7wisn2sq
Diffstat (limited to 'bin/addons/base/module')
-rw-r--r--bin/addons/base/module/module.py32
1 files changed, 12 insertions, 20 deletions
diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index f05b2c382d2..19a7962370c 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -98,9 +98,9 @@ class module(osv.osv):
for m in mlist:
mnames[m.name] = m.id
res[m.id] = {
- 'menus_by_module':'',
- 'reports_by_module':'',
- 'views_by_module': ''
+ 'menus_by_module':[],
+ 'reports_by_module':[],
+ 'views_by_module': []
}
view_id = model_data_obj.search(cr,uid,[('module','in', mnames.keys()),
('model','in',('ir.ui.view','ir.actions.report.xml','ir.ui.menu'))])
@@ -109,26 +109,18 @@ class module(osv.osv):
try:
key = data_id['model']
if key=='ir.ui.view':
- try:
- v = view_obj.browse(cr,uid,data_id.res_id)
- aa = v.inherit_id and '* INHERIT ' or ''
- res[mnames[data_id.module]]['views_by_module'] += aa + v.name + ' ('+v.type+')\n'
- except Exception:
- self.__logger.debug(
- 'Unknown error while browsing ir.ui.view[%s]',
- data_id.res_id, exc_info=True)
+ v = view_obj.browse(cr,uid,data_id.res_id)
+ aa = v.inherit_id and '* INHERIT ' or ''
+ res[mnames[data_id.module]]['views_by_module'].append(aa + v.name + '('+v.type+')')
elif key=='ir.actions.report.xml':
- res[mnames[data_id.module]]['reports_by_module'] += report_obj.browse(cr,uid,data_id.res_id).name + '\n'
+ res[mnames[data_id.module]]['reports_by_module'].append(report_obj.browse(cr,uid,data_id.res_id).name)
elif key=='ir.ui.menu':
- try:
- m = menu_obj.browse(cr,uid,data_id.res_id)
- res[mnames[data_id.module]]['menus_by_module'] += m.complete_name + '\n'
- except Exception:
- self.__logger.debug(
- 'Unknown error while browsing ir.ui.menu[%s]',
- data_id.res_id, exc_info=True)
- except KeyError:
+ res[mnames[data_id.module]]['menus_by_module'].append(menu_obj.browse(cr,uid,data_id.res_id).complete_name)
+ except KeyError, e:
pass
+ for key, value in res.iteritems() :
+ for k, v in res[key].iteritems() :
+ res[key][k] = "\n".join(sorted(v))
return res
_columns = {