From bd026cd3c0800db79d16b9a88e4735de40f74da6 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 21 Feb 2012 09:55:45 +0100 Subject: [fix] forgot one usage of normal dialog method bzr revid: nicolas.vanhoren@openerp.com-20120221085545-mgd73hrvr6fcp0g6 --- addons/web_dashboard/static/src/js/dashboard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/web_dashboard/static/src/js') diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index 4972d32c584..a2ea775282a 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -58,7 +58,7 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({ var qdict = { current_layout : this.$element.find('.oe-dashboard').attr('data-layout') }; - var $dialog = $('
').dialog({ + var $dialog = openerp.web.dialog($('
'), { modal: true, title: _t("Edit Layout"), width: 'auto', -- cgit v1.2.3 From 8384876ef08ae3e8af97a9531da7f79a8359d607 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 21 Feb 2012 16:30:23 +0100 Subject: [imp] renamed widget_parent to getParent() bzr revid: nicolas.vanhoren@openerp.com-20120221153023-cqs66neaddtuf7km --- addons/web_dashboard/static/src/js/dashboard.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/web_dashboard/static/src/js') diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index a2ea775282a..90bca6c0255 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -238,8 +238,8 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({ this.$element.html(rendered); }, do_reload: function() { - var view_manager = this.view.widget_parent, - action_manager = view_manager.widget_parent; + var view_manager = this.view.getParent(), + action_manager = view_manager.getParent(); this.view.stop(); action_manager.do_action(view_manager.action); } @@ -341,7 +341,7 @@ openerp.web_dashboard.ConfigOverview = openerp.web.View.extend({ }); }) .delegate('li:not(.oe-done)', 'click', function () { - self.widget_parent.widget_parent.widget_parent.do_execute_action({ + self.getParent().getParent().getParent().do_execute_action({ type: 'object', name: 'action_launch' }, self.dataset, -- cgit v1.2.3 From 75d39c7f6a2565419c28bac4397678a6d60c5544 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 21 Feb 2012 17:29:12 +0100 Subject: [imp] renammed stop() bzr revid: nicolas.vanhoren@openerp.com-20120221162912-zheko30qoh84hcoq --- addons/web_dashboard/static/src/js/dashboard.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'addons/web_dashboard/static/src/js') diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index 90bca6c0255..793ad651b81 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -240,7 +240,7 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({ do_reload: function() { var view_manager = this.view.getParent(), action_manager = view_manager.getParent(); - this.view.stop(); + this.view.destroy(); action_manager.do_action(view_manager.action); } }); @@ -463,8 +463,8 @@ openerp.web_dashboard.ApplicationInstaller = openerp.web.OldWidget.extend({ }); return r; }, - stop: function() { - this.action_manager.stop(); + destroy: function() { + this.action_manager.destroy(); return this._super(); } }); -- cgit v1.2.3 From 2d03b80c7dcb5d65973a0ea383df72416dbb66ac Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 28 Feb 2012 14:41:21 +0100 Subject: [IMP] New menus bzr revid: fme@openerp.com-20120228134121-bxs33qrpevrfkctp --- addons/web_dashboard/static/src/js/dashboard.js | 1 - 1 file changed, 1 deletion(-) (limited to 'addons/web_dashboard/static/src/js') diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index 793ad651b81..1953a18814a 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -406,7 +406,6 @@ openerp.web_dashboard.ApplicationTiles = openerp.web.OldWidget.extend({ }, start: function() { var self = this; - openerp.webclient.menu.do_hide_secondary(); var domain = [['application','=',true], ['state','=','installed'], ['name', '!=', 'base']]; var ds = new openerp.web.DataSetSearch(this, 'ir.module.module',{},domain); ds.read_slice(['id']).then(function(result) { -- cgit v1.2.3 From 7eb12aee74633e4f240b0373eae476788c14ecba Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Wed, 29 Feb 2012 12:07:44 +0100 Subject: [imp] renammed render_element bzr revid: nicolas.vanhoren@openerp.com-20120229110744-0m55gqlme6s225jv --- addons/web_dashboard/static/src/js/dashboard.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/web_dashboard/static/src/js') diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index 793ad651b81..afe64e6284e 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -225,7 +225,7 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({ }); } }, - render_element: function() { + renderElement: function() { // We should start with three columns available for (var i = this.node.children.length; i < 3; i++) { this.node.children.push({ @@ -245,7 +245,7 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({ } }); openerp.web.form.DashBoardLegacy = openerp.web.form.DashBoard.extend({ - render_element: function() { + renderElement: function() { if (this.node.tag == 'hpaned') { this.node.attrs.style = '2-1'; } else if (this.node.tag == 'vpaned') { -- cgit v1.2.3 From db24973abeccb64a9c40239da952ca0fd6e147e2 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 7 Mar 2012 13:49:08 +0100 Subject: [FIX] Dashboard does not handle two actions with the same action id. Dashboard should be refactored in trunk in order to be nivified and use a DashBoardAction class bzr revid: fme@openerp.com-20120307124908-q48a2d8epae73wwx --- addons/web_dashboard/static/src/js/dashboard.js | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'addons/web_dashboard/static/src/js') diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index 1ebc987c9f6..698d0b7da08 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -11,7 +11,6 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({ init: function(view, node) { this._super(view, node); this.template = 'DashBoard'; - this.actions_attrs = {}; this.action_managers = []; }, start: function() { @@ -31,18 +30,16 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({ this.$element.delegate('.oe-dashboard-column .oe-dashboard-fold', 'click', this.on_fold_action); this.$element.delegate('.oe-dashboard-column .ui-icon-closethick', 'click', this.on_close_action); - this.actions_attrs = {}; // Init actions _.each(this.node.children, function(column, column_index) { _.each(column.children, function(action, action_index) { delete(action.attrs.width); delete(action.attrs.height); delete(action.attrs.colspan); - self.actions_attrs[action.attrs.name] = action.attrs; self.rpc('/web/action/load', { action_id: parseInt(action.attrs.name, 10) }, function(result) { - self.on_load_action(result, column_index + '_' + action_index); + self.on_load_action(result, column_index + '_' + action_index, action.attrs); }); }); }); @@ -97,9 +94,9 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({ $action = $e.parents('.oe-dashboard-action:first'), id = parseInt($action.attr('data-id'), 10); if ($e.is('.ui-icon-minusthick')) { - this.actions_attrs[id].fold = '1'; + $action.data('action_attrs').fold = '1'; } else { - delete(this.actions_attrs[id].fold); + delete($action.data('action_attrs').fold); } $e.toggleClass('ui-icon-minusthick ui-icon-plusthick'); $action.find('.oe-dashboard-action-content').toggle(); @@ -122,7 +119,7 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({ var actions = []; $(this).find('.oe-dashboard-action').each(function() { var action_id = $(this).attr('data-id'), - new_attrs = _.clone(self.actions_attrs[action_id]); + new_attrs = _.clone($(this).data('action_attrs')); if (new_attrs.domain) { new_attrs.domain = new_attrs.domain_string; delete(new_attrs.domain_string); @@ -143,10 +140,9 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({ self.$element.find('.oe-dashboard-link-reset').show(); }); }, - on_load_action: function(result, index) { + on_load_action: function(result, index, action_attrs) { var self = this, action = result.result, - action_attrs = this.actions_attrs[action.id], view_mode = action_attrs.view_mode; if (action_attrs.context) { @@ -187,6 +183,7 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({ var am = new openerp.web.ActionManager(this), // FIXME: ideally the dashboard view shall be refactored like kanban. $action = $('#' + this.view.element_id + '_action_' + index); + $action.parent().data('action_attrs', action_attrs); this.action_managers.push(am); am.appendTo($action); am.do_action(action); -- cgit v1.2.3 From c0439810efa83009741eb9307794e5cafb943df3 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 7 Mar 2012 17:05:03 +0100 Subject: [FIX] Add to dashboard domain & context merging problems bzr revid: fme@openerp.com-20120307160503-w1mha79xiznl4x6h --- addons/web_dashboard/static/src/js/dashboard.js | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'addons/web_dashboard/static/src/js') diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index 698d0b7da08..e445bf6c1ed 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -145,13 +145,20 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({ action = result.result, view_mode = action_attrs.view_mode; - if (action_attrs.context) { - action.context = _.extend((action.context || {}), action_attrs.context); - } - if (action_attrs.domain) { - action.domain = action.domain || []; - action.domain.unshift.apply(action.domain, action_attrs.domain); + if (action_attrs.context && action_attrs.context['dashboard_merge_domains_contexts'] === false) { + // TODO: replace this 6.1 workaround by attribute on + action.context = action_attrs.context || {}; + action.domain = action_attrs.domain || []; + } else { + if (action_attrs.context) { + action.context = _.extend((action.context || {}), action_attrs.context); + } + if (action_attrs.domain) { + action.domain = action.domain || []; + action.domain.unshift.apply(action.domain, action_attrs.domain); + } } + var action_orig = _.extend({ flags : {} }, action); if (view_mode && view_mode != action.view_mode) { -- cgit v1.2.3