audrius/web
1
0
Fork 1
mirror of https://github.com/OCA/web.git synced 2025-02-22 13:21:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

[IMP] Improve shortcut model

Browse Source
This commit is contained in:
Adrien Peiffer
2014-08-26 16:33:23 +02:00
parent 4d88efa750
commit 61637c566f
3 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web_shortcuts/static/src/js/web_shortcuts.js
View File

@@ -33,7 +33,7 @@ instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({
this.on('display', this, this.display);
this.on('remove', this, this.remove);
this.on('click', this, this.click);
this.model = new instance.web.Model('ir.ui.view_sc');
this.model = new instance.web.Model('web.shortcut');
},
start: function() {
var self = this;
@@ -46,9 +46,8 @@ instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({
load: function() {
var self = this;
this.$el.find('.oe_systray_shortcuts_items').empty();
return this.model.call('get_sc', [
return this.model.call('get_user_shortcuts', [
instance.session.uid,
'ir.ui.menu',
instance.web.pyeval.eval('context', {})
]).done(function(shortcuts) {
_.each(shortcuts, function(sc) {
@@ -138,8 +137,7 @@ instance.web.ViewManagerAction.include({
} else {
shortcuts_menu.trigger('add', {
'user_id': self.session.uid,
'res_id': self.session.active_id,
'resource': 'ir.ui.menu',
'menu_id': self.session.active_id,
'name': self.action.name
});
}

2
web_shortcuts/static/src/xml/web_shortcuts.xml
View File

@@ -13,7 +13,7 @@
</t>
<t t-name="Systray.Shortcuts.Item">
<li>
<a href="#" t-att-data-id="shortcut.res_id" t-att-data-shortcut-id="shortcut.id">
<a href="#" t-att-data-id="shortcut.menu_id[0]" t-att-data-shortcut-id="shortcut.id">
<t t-esc="shortcut.name"/>
</a>
</li>