Skip to content

Commit

Permalink
Merge pull request #6 from acsone/10.0-web_shortcut_compatibility_ent…
Browse files Browse the repository at this point in the history 
…erprise_tbi

[MIG] [10.0] web_shortcut: bring compatibility with Odoo Enterprise
  • Loading branch information
Dennis Sluijk authored Apr 3, 2017
2 parents 50828e0 + 28bbd0d commit 3ddc584
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 50 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ var/
*.egg-info/
.installed.cfg
*.egg
*.eggs

# Installer logs
pip-log.txt
Expand Down
1 change: 1 addition & 0 deletions web_shortcut/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ Contributors
* Adrien Peiffer
* Dennis Sluijk <[email protected]>
* Odoo SA
* Thomas Binsfeld <[email protected]>

Maintainer
----------
Expand Down
103 changes: 53 additions & 50 deletions web_shortcut/static/src/js/web_shortcut.js
View file
Original file line number Diff line number Diff line change
@@ -1,120 +1,112 @@
/* Copyright 2004-today Odoo SA (<http://www.odoo.com>)
* License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */

odoo.define('web.shortcut', function(require) {
odoo.define('web.shortcut', function (require) {
var Widget = require('web.Widget'),
UserMenu = require('web.UserMenu'),
WebClient = require('web.WebClient'),
ViewManager = require('web.ViewManager'),
ActionManager = require('web.ActionManager'),
core = require('web.core'),
qweb = core.qweb,
DataModel = require('web.DataModel'),
session = require('web.session');

session = require('web.session'),
SystrayMenu = require('web.SystrayMenu');

var ShortcutMenu = Widget.extend({
template: 'Systray.ShortcutMenu',
init: function() {
init: function () {
this._super();
this.on('load', this, this.load);
this.on('add', this, this.add);
this.on('display', this, this.display);
this.on('remove', this, this.remove);
this.model = new DataModel('web.shortcut');
},
start: function() {
start: function () {
var self = this;
this._super();
this.trigger('load');
this.$el.on('click', '.oe_systray_shortcut_menu a', function() {
this.$el.on('click', '.oe_systray_shortcut_menu a', function () {
self.click($(this));
});
},
load: function() {
load: function () {
var self = this;
this.$el.find('.oe_systray_shortcut_menu').empty();
return this.model.call('get_user_shortcuts', [
]).done(function(shortcuts) {
_.each(shortcuts, function(sc) {
return this.model.call('get_user_shortcuts', []).done(function (shortcuts) {
self.$el.find('.oe_systray_shortcut_menu').empty();
_.each(shortcuts, function (sc) {
self.trigger('display', sc);
});
});
},
add: function (sc) {
var self = this;
this.model.call('create', [sc]).then(function(out){
this.model.call('create', [sc]).then(function (out) {
self.trigger('load');
});
},
display: function(sc) {
display: function (sc) {
var self = this;
this.$el.find('.oe_systray_shortcut_menu').append();
var $sc = $(qweb.render('Systray.ShortcutMenu.Item', {shortcut: sc}));
$sc.appendTo(self.$el.find('.oe_systray_shortcut_menu'));
},
remove: function (menu_id) {
var menu_id = this.session.active_id;
var $shortcut = this.$el.find('.oe_systray_shortcut_menu li a[data-id=' + menu_id + ']');
var shortcut_id = $shortcut.data('shortcut-id');
$shortcut.remove();
this.model.call('unlink', [shortcut_id]);
},
click: function($link) {
click: function ($link) {
var self = this,
action_id = $link.data('id');

new DataModel('ir.ui.menu').query(['action']).filter([['id', '=', action_id]]).context(null).all().then(function(menu) {
new DataModel('ir.ui.menu').query(['action']).filter([['id', '=', action_id]]).context(null).all().then(function (menu) {
var action_str = menu[0].action;
var action_str_parts = action_str.split(',');
action_id = parseInt(action_str_parts[1]);
self.trigger('click', action_id);
});
},
has: function(menu_id) {
has: function (menu_id) {
return !!this.$el.find('a[data-id=' + menu_id + ']').length;
}
});


UserMenu.include({
start: function() {
this.shortcuts = new ShortcutMenu(self);
this.shortcuts.prependTo(this.$el.parent());
return this._super.apply(this, arguments);
},
do_update: function() {
var self = this;
var res = this._super.apply(this, arguments);
this.shortcuts.trigger('load');
return res;
},
});
SystrayMenu.Items.push(ShortcutMenu);


WebClient.include({
show_application: function() {
current_action_updated: function (action) {
this.shortcut_menu = _.find(this.systray_menu.widgets, function (item) {
return item instanceof ShortcutMenu;
});
},
show_application: function () {
var self = this;
var res = this._super.apply(this, arguments);
this.user_menu.shortcuts.on('click', this, function(action_id) {
self.do_action(action_id, {
clear_breadcrumbs: true,
replace_breadcrumb: true
return this._super.apply(this, arguments).then(function () {
self.shortcut_menu = _.find(self.systray_menu.widgets, function (item) {
return item instanceof ShortcutMenu;
});
self.shortcut_menu.on('click', self, function (action_id) {
self.do_action(action_id, {
clear_breadcrumbs: true,
replace_breadcrumb: true
});
});
});
return res;
}
});


ViewManager.include({
switch_mode: function (view_type, no_store) {
var self = this;
return this._super.apply(this, arguments).done(function() {
return this._super.apply(this, arguments).done(function () {
self.shortcut_check(self.views[view_type]);
});
},
shortcut_check: function(view) {
shortcut_check: function (view) {
var self = this;

// Child view managers
Expand All @@ -124,26 +116,37 @@ odoo.define('web.shortcut', function(require) {

// display shortcuts if on the first view for the action
var $shortcut_toggle = this.action_manager.main_control_panel.$el.find('.oe_shortcut_toggle');
if (!this.action.name ||
!(view.view_type === this.view_stack[0].view_type &&
if (!this.action.name || !(view.view_type === this.view_stack[0].view_type &&
view.view_id === this.view_stack[0].view_id)
) {
) {
$shortcut_toggle.addClass('hidden');
return;
}
$shortcut_toggle.removeClass('hidden');

// Anonymous users don't have user_menu
var shortcuts_menu = this.action_manager.webclient.user_menu.shortcuts;
var shortcuts_menu = this.action_manager.webclient.shortcut_menu;
if (shortcuts_menu) {
$shortcut_toggle.toggleClass('oe_shortcut_remove', shortcuts_menu.has(self.session.active_id));
$shortcut_toggle.unbind("click").click(function() {
$shortcut_toggle.unbind("click").click(function () {
var menu_id = session.active_id;
// In the case we come from a parent menu, no action is linked to the menu
// We must take the first child menu
if (self.action_manager.webclient.menu_data) {
for (var i = 0; i < self.action_manager.webclient.menu_data.children.length; i++) {
if (self.action_manager.webclient.menu_data.children[i].id === session.active_id) {
menu_id = self.action_manager.webclient.menu_data.children[i].children[0].id;
break;
}
}
}
if ($shortcut_toggle.hasClass("oe_shortcut_remove")) {
shortcuts_menu.trigger('remove', self.session.active_id);
} else {
shortcuts_menu.trigger('remove', menu_id);
}
else {
shortcuts_menu.trigger('add', {
'user_id': session.uid,
'menu_id': session.active_id,
'menu_id': menu_id,
'name': session.name
});
}
Expand All @@ -155,7 +158,7 @@ odoo.define('web.shortcut', function(require) {


ActionManager.include({
do_action: function() {
do_action: function () {
this.main_control_panel.$el.find('.oe_shortcut_toggle').addClass('hidden');
return this._super.apply(this, arguments);
}
Expand Down

0 comments on commit 3ddc584

Please sign in to comment.