odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX]Reload whole favorites (by rpc call) instead of adding the new one, otherwise the name of the new starred item is not structured like the other ones 

lp bug: https://launchpad.net/bugs/1077138 fixed

bzr revid: dle@openerp.com-20121115160550-p5kc3j8swxu3lfv0
This commit is contained in:
Denis Ledoux dle@openerp.com 2012-11-15 17:05:50 +01:00
parent bba12d9e95
commit e72542b6ec
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/web_shortcuts/static/src/js/web_shortcuts.js
View File

@ -55,11 +55,7 @@ instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({
add: function (sc) { add: function (sc) {
var self = this; var self = this;
this.dataset.create(sc).then(function(out){ this.dataset.create(sc).then(function(out){
self.trigger('display', { self.trigger('load');
name : sc.name,
id : out,
res_id : sc.res_id
});
}); });
}, },
display: function(sc) { display: function(sc) {
@ -108,24 +104,24 @@ instance.web.UserMenu.include({
}); });
instance.web.ViewManagerAction.include({ instance.web.ViewManagerAction.include({
switch_mode: function () { switch_mode: function (view_type, no_store) {
var self = this; var self = this;
this._super.apply(this, arguments).done(function() { this._super.apply(this, arguments).done(function() {
self.shortcut_check(); self.shortcut_check(self.views[view_type]);
}); });
}, },
shortcut_check : function() { shortcut_check : function(view) {
var self = this; var self = this;
var shortcuts_menu = instance.webclient.user_menu.shortcuts; var shortcuts_menu = instance.webclient.user_menu.shortcuts;
var grandparent = this.getParent() && this.getParent().getParent(); var grandparent = this.getParent() && this.getParent().getParent();
// display shortcuts if on the first view for the action // display shortcuts if on the first view for the action
var $shortcut_toggle = this.$el.find('.oe_shortcuts_toggle'); var $shortcut_toggle = this.$el.find('.oe_shortcuts_toggle');
/*if (!this.action.name || if (!this.action.name ||
!(view.view_type === this.views_src[0].view_type !(view.view_type === this.views_src[0].view_type
&& view.view_id === this.views_src[0].view_id)) { && view.view_id === this.views_src[0].view_id)) {
$shortcut_toggle.hide(); $shortcut_toggle.hide();
return; return;
}*/ }
$shortcut_toggle.toggleClass('oe_shortcuts_remove', shortcuts_menu.has(self.session.active_id)); $shortcut_toggle.toggleClass('oe_shortcuts_remove', shortcuts_menu.has(self.session.active_id));
$shortcut_toggle.unbind("click").click(function() { $shortcut_toggle.unbind("click").click(function() {
if ($shortcut_toggle.hasClass("oe_shortcuts_remove")) { if ($shortcut_toggle.hasClass("oe_shortcuts_remove")) {