Dharti Ratani(OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-web-multi-tab-dhr into lp:openerp-web.
Requested reviews:
OpenERP R&D Web Team (openerp-dev-web)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-web-multi-tab-dhr/+merge/101546
Hello,
Added links for menu and shortcuts to open them in new tab.
Thanks.
dhr
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-web-multi-tab-dhr/+merge/101546
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-web-multi-tab-dhr.
=== modified file 'addons/web/controllers/main.py'
--- addons/web/controllers/main.py 2012-04-05 12:46:52 +0000
+++ addons/web/controllers/main.py 2012-04-11 12:45:26 +0000
@@ -566,8 +566,14 @@
@openerpweb.jsonrequest
def sc_list(self, req):
- return req.session.model('ir.ui.view_sc').get_sc(
+ shortcuts= req.session.model('ir.ui.view_sc').get_sc(
req.session._uid, "ir.ui.menu", req.session.eval_context(req.context))
+ Menu = req.session.model('ir.ui.menu')
+ for shortcut in shortcuts:
+ m_item = Menu.read(shortcut['res_id'], ['action'], context=None)
+ action_id = m_item['action'].split(',')[1]
+ shortcut.update({'action_id':action_id})
+ return shortcuts
@openerpweb.jsonrequest
def get_lang_list(self, req):
@@ -902,7 +908,6 @@
for menu_item in menu_items:
menu_item.setdefault('children', []).sort(
key=operator.itemgetter('sequence'))
-
return menu_root
@openerpweb.jsonrequest
=== modified file 'addons/web/static/src/js/chrome.js'
--- addons/web/static/src/js/chrome.js 2012-04-02 14:22:51 +0000
+++ addons/web/static/src/js/chrome.js 2012-04-11 12:45:26 +0000
@@ -869,16 +869,19 @@
$(sc.binding).bind({
'add': function (e, attrs) {
shortcuts_ds.create(attrs, function (out) {
+ self.rpc('/web/menu/action',{'menu_id':attrs.res_id}, function(ir_menu_data) {
var shortcut = QWeb.render('UserMenu.shortcut', {
shortcuts : [{
name : attrs.name,
id : out.result,
- res_id : attrs.res_id
+ res_id : attrs.res_id,
+ action_id : ir_menu_data.action[0][2].id
}]
});
$(shortcut).appendTo(self.$element.find('.oe_dropdown_options'));
attrs.id = out.result;
sc.push(attrs);
+ });
});
},
'remove-current': function () {
@@ -896,7 +899,6 @@
return this.rpc('/web/session/sc_list', {}, function(shortcuts) {
sc.splice(0, sc.length);
sc.push.apply(sc, shortcuts);
-
$(QWeb.render('UserMenu.shortcut', {'shortcuts': shortcuts}))
.appendTo(self.$element.find('.oe_dropdown_options'));
});
=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml 2012-04-03 20:54:53 +0000
+++ addons/web/static/src/xml/base.xml 2012-04-11 12:45:26 +0000
@@ -362,7 +362,8 @@
</ul>
</t>
<t t-name="Menu.secondary.link">
- <a href="#"
+ <t t-set="id" t-value="menu.action ? menu.action.split(',')[1] : ''"></t>
+ <a t-att-href="menu.children.length and !menu.action ? '#' : '#action_id='+id"
t-att-class="menu.children.length ? 'oe_menu_toggler' : 'oe_menu_leaf'"
t-att-data-menu="menu.id"
t-att-data-action-model="menu.action ? menu.action.split(',')[0] : ''"
@@ -396,7 +397,7 @@
</t>
<t t-name="UserMenu.shortcut">
<li t-foreach="shortcuts" t-as="shortcut">
- <a href="#" data-menu="shortcut" t-att-data-id="shortcut.res_id" t-att-data-shortcut-id="shortcut.id">
+ <a t-att-href="'#action_id='+shortcut.action_id" data-menu="shortcut" t-att-data-id="shortcut.res_id" t-att-data-shortcut-id="shortcut.id">
<t t-esc="shortcut.name"/>
</a>
</li>
_______________________________________________
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
