From f8510eee62b6389e231f1b7fc76e62545f8061ed Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Fri, 30 Mar 2012 16:27:31 +0530 Subject: [PATCH] [IMP] Improved code to show need action counter bzr revid: tpa@tinyerp.com-20120330105731-ss03y3l4fi5mq3jd --- addons/web/controllers/main.py | 4 ++-- addons/web/static/src/css/base.css | 11 +++++++++++ addons/web/static/src/xml/base.xml | 5 +++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index c159929ead0..2dc1c32f88f 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -875,13 +875,13 @@ class Menu(openerpweb.Controller): context = req.session.eval_context(req.context) Menus = req.session.model('ir.ui.menu') - menu_roots = Menus.read(self.do_get_user_roots(req), ['name', 'sequence', 'parent_id', 'action'], context) + menu_roots = Menus.read(self.do_get_user_roots(req), ['name', 'sequence', 'parent_id', 'action', 'needaction_uid_ctr', 'uses_needaction'], context) menu_root = {'id': False, 'name': 'root', 'parent_id': [-1, ''], 'children' : menu_roots} # menus are loaded fully unlike a regular tree view, cause there are a # limited number of items (752 when all 6.1 addons are installed) menu_ids = Menus.search([], 0, False, False, context) - menu_items = Menus.read(menu_ids, ['name', 'sequence', 'parent_id', 'action'], context) + menu_items = Menus.read(menu_ids, ['name', 'sequence', 'parent_id', 'action', 'needaction_uid_ctr', 'uses_needaction'], context) # adds roots at the end of the sequence, so that they will overwrite # equivalent menu items from full menu read when put into id:item # mapping, resulting in children being correctly set on the roots. diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index b0a2b7945b9..3f44d6f6cda 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -264,6 +264,17 @@ border-right: 4px solid transparent; border-top: 4px solid #4c4c4c; } +.oe_menu_counter { + float:right; + background: #eeeeee; + color: #8a89ba; + font-weight: bold; + border-width:1px; + padding-top:2px; + padding-right:4px; + padding-left:4px; + border-radius:2px; +} .openerp2 .oe_dropdown { position: relative; } diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 894f7353c1a..fdef85aae5d 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -368,6 +368,11 @@ t-att-data-action-model="menu.action ? menu.action.split(',')[0] : ''" t-att-data-action-id="menu.action ? menu.action.split(',')[1] : ''"> + +
+ +
+