From e74e30708067e4626c7e096dfe6ea765d1b4aca2 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 16 Aug 2011 14:37:24 +0200
Subject: [PATCH] [IMP] numerical id => move to data-id, from @id. Also fixes
 active_id as string which failed to match the numerical id stored, and did
 not mark the toggler as 'to remove' when opening an action from the
 corresponding shortcut

bzr revid: xmo@openerp.com-20110816123724-2ti43xqeue3esx3x
---
 addons/base/static/src/js/chrome.js | 5 +++--
 addons/base/static/src/js/views.js  | 2 +-
 addons/base/static/src/xml/base.xml | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 922ba876504..5079944c433 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -871,8 +871,9 @@ openerp.base.Header =  openerp.base.Widget.extend({
                 .undelegate('li', 'click')
                 .delegate('li', 'click', function(e) {
                     e.stopPropagation();
-                    self.session.active_id = this.id;
-                    self.rpc('/base/menu/action', {'menu_id':this.id}, function(ir_menu_data) {
+                    var id = $(this).data('id');
+                    self.session.active_id = id;
+                    self.rpc('/base/menu/action', {'menu_id':id}, function(ir_menu_data) {
                         if (ir_menu_data.action.length){
                             self.on_action(ir_menu_data.action[0][2]);
                         }
diff --git a/addons/base/static/src/js/views.js b/addons/base/static/src/js/views.js
index 4df26c60ae8..08520ca7d43 100644
--- a/addons/base/static/src/js/views.js
+++ b/addons/base/static/src/js/views.js
@@ -381,7 +381,7 @@ openerp.base.ViewManagerAction = openerp.base.ViewManager.extend({
         var dataset_shortcut = new openerp.base.DataSet(this, 'ir.ui.view_sc');
         $shortcut_toggle.click(function() {
             if ($shortcut_toggle.hasClass("oe-shortcut-remove")) {
-                var unlink_id = $(".oe-shortcuts li[id=" + self.session.active_id + "]").data('shortcut-id');
+                var unlink_id = $(".oe-shortcuts li[data-id=" + self.session.active_id + "]").data('shortcut-id');
                 dataset_shortcut.unlink([parseInt(unlink_id)]);
                 $shortcut_toggle.removeClass("oe-shortcut-remove");
             } else {
diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index c35080644ff..2111ba11c54 100644
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -364,7 +364,7 @@
 </t>
 <ul t-name="Shortcuts">
     <li t-foreach="shortcuts" t-as="shortcut"
-            t-att-id="shortcut.res_id"
+            t-att-data-id="shortcut.res_id"
             t-att-data-shortcut-id="shortcut.id"
         ><t t-esc="shortcut.name"/></li>
 </ul>