diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-12-10 14:16:58 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-12-10 14:16:58 +0100 |
| commit | 5d2d4dea2cae780f1b42718170b3aedeb2f0df73 (patch) | |
| tree | bb98ec7f4822b39d19590386e36941213a06d3ae /addons/web/static/src/xml | |
| parent | 70f8f99b35c93a880cf15a1f21b7f88aef5a8d36 (diff) | |
| parent | 1ca5e68b1f3ddb440b104c6c47ea35e8d26a1eed (diff) | |
[MERGE] Needaction loading update.
This web revision modifies the way needaction are loaded. Now they are loaded independently of the menus. After having loaded and displayed the various menus, a call to the server is done to avoid a long latency between the login and the display of menus. Needaction counter will be displayed as soon as they are available.
bzr revid: tde@openerp.com-20121210131658-pgy3t9t71f0z2yd5
Diffstat (limited to 'addons/web/static/src/xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index e742f336dc0..5ad24a43a6a 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -388,14 +388,16 @@ t-att-data-action-model="menu.action ? menu.action.split(',')[0] : ''" t-att-data-action-id="menu.action ? menu.action.split(',')[1] : ''"> <t t-esc="menu.name"/> - <t t-if="menu.needaction_enabled and menu.needaction_counter"> - <div class="oe_tag oe_tag_dark oe_menu_counter"> - <t t-if="menu.needaction_counter > 99"> 99+ </t><t t-if="menu.needaction_counter <= 99"> <t t-esc="menu.needaction_counter"/> </t> - </div> - </t> </a> </t> +<t t-name="Menu.needaction_counter"> + <div class="oe_tag oe_tag_dark oe_menu_counter"> + <t t-if="widget.needaction_counter > 99"> 99+ </t> + <t t-if="widget.needaction_counter <= 99"> <t t-esc="widget.needaction_counter"/> </t> + </div> +</t> + <t t-name="UserMenu"> <span class="oe_user_menu oe_topbar_item oe_dropdown_toggle oe_dropdown_arrow"> <img class="oe_topbar_avatar" t-att-data-default-src="_s + '/web/static/src/img/user_menu_avatar.png'"/> |