From fc9901c7a5dd4c5a1787a53ffae2c2795ac1db17 Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Thu, 7 Jun 2012 16:06:47 +0530 Subject: [PATCH 1/5] [IMP] Add action help if noaction on deshbaord bzr revid: jam@tinyerp.com-20120607103647-8ylpddobydc6ed1d --- .../web_dashboard/static/src/js/dashboard.js | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index 761876929da..8b8d34c6368 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -231,6 +231,15 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ } }, renderElement: function() { + var self = this; + //to Check dash contains any action if not then show the action help + var array= []; + _.each(this.node.children, function(column, column_index) { + array.push(_.include(_.pluck(column.children,"tag"),"action")); + }); + if (! _.include(array,true)){ + return self.no_result(); + } // We should start with three columns available for (var i = this.node.children.length; i < 3; i++) { this.node.children.push({ @@ -242,6 +251,17 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ var rendered = QWeb.render(this.form_template, this); this.$element.html(rendered); }, + no_result: function () { + if (!this.view.options.action + || !this.view.options.action.help) { + return; + } + this.$element.prepend( + $('
') + .append($('', { src: '/web_dashboard/static/src/img/view_todo_arrow.png' })) + .append($('
').html(this.view.options.action.help)) + ); + }, do_reload: function() { var view_manager = this.view.getParent(), action_manager = view_manager.getParent(); From 5bf89ebd7159bb59fac9e61002a903f636678325 Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Thu, 7 Jun 2012 16:07:13 +0530 Subject: [PATCH 2/5] [ADD] Added the image help arrow bzr revid: jam@tinyerp.com-20120607103713-gls9104930lrjnsg --- .../static/src/img/view_todo_arrow.png | Bin 0 -> 3389 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 addons/web_dashboard/static/src/img/view_todo_arrow.png diff --git a/addons/web_dashboard/static/src/img/view_todo_arrow.png b/addons/web_dashboard/static/src/img/view_todo_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..8633430e9aebc63cf85dd08fefd7926b773173b1 GIT binary patch literal 3389 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 Tu8hFi00000NkvXXu0mjfq2O{c literal 0 HcmV?d00001 From 2b2b1ec41b09e573e1cec5476de32ad81a60309b Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Fri, 8 Jun 2012 14:54:04 +0530 Subject: [PATCH 3/5] [IMP] imporved code bzr revid: jam@tinyerp.com-20120608092404-p5832c093dbkwzna --- addons/web_dashboard/static/src/js/dashboard.js | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index 8b8d34c6368..42fde360d72 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -232,14 +232,13 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ }, renderElement: function() { var self = this; - //to Check dash contains any action if not then show the action help - var array= []; - _.each(this.node.children, function(column, column_index) { - array.push(_.include(_.pluck(column.children,"tag"),"action")); + var check = _.detect(this.node.children, function(column, column_index) { + return _.detect(column.children,function(element){ + return element.tag === "action"? element: false; + }); }); - if (! _.include(array,true)){ + if (!check) return self.no_result(); - } // We should start with three columns available for (var i = this.node.children.length; i < 3; i++) { this.node.children.push({ @@ -252,14 +251,10 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ this.$element.html(rendered); }, no_result: function () { - if (!this.view.options.action - || !this.view.options.action.help) { - return; - } this.$element.prepend( $('
') .append($('', { src: '/web_dashboard/static/src/img/view_todo_arrow.png' })) - .append($('
').html(this.view.options.action.help)) + .append($('
').html(this.view.options.action.help || " ")) ); }, do_reload: function() { From e9ab3b16fa77f5e64acee507fe0f30b991f835cf Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Fri, 8 Jun 2012 15:50:15 +0530 Subject: [PATCH 4/5] [FIX] no image if no help on action bzr revid: jam@tinyerp.com-20120608102015-jpyv7zji3j0zocrg --- addons/web_dashboard/static/src/js/dashboard.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index 42fde360d72..a27c5f30bb5 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -251,11 +251,13 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ this.$element.html(rendered); }, no_result: function () { - this.$element.prepend( - $('
') - .append($('', { src: '/web_dashboard/static/src/img/view_todo_arrow.png' })) - .append($('
').html(this.view.options.action.help || " ")) - ); + if (this.view.options.action.help){ + this.$element.append( + $('
') + .append($('', { src: '/web_dashboard/static/src/img/view_todo_arrow.png' })) + .append($('
').html(this.view.options.action.help || " ")) + ); + } }, do_reload: function() { var view_manager = this.view.getParent(), From c7ea0c3761e6a4be80209f4f1b0b8798cf4bded6 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 21 Jun 2012 11:55:23 +0200 Subject: [PATCH 5/5] [IMP] Code styling bzr revid: fme@openerp.com-20120621095523-tfc8r2pan80f9a3i --- addons/web_dashboard/static/src/js/dashboard.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js index a27c5f30bb5..e08113d02ab 100644 --- a/addons/web_dashboard/static/src/js/dashboard.js +++ b/addons/web_dashboard/static/src/js/dashboard.js @@ -231,14 +231,14 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ } }, renderElement: function() { - var self = this; var check = _.detect(this.node.children, function(column, column_index) { return _.detect(column.children,function(element){ return element.tag === "action"? element: false; }); }); - if (!check) - return self.no_result(); + if (!check) { + return this.no_result(); + } // We should start with three columns available for (var i = this.node.children.length; i < 3; i++) { this.node.children.push({ @@ -250,8 +250,8 @@ instance.web.form.DashBoard = instance.web.form.FormWidget.extend({ var rendered = QWeb.render(this.form_template, this); this.$element.html(rendered); }, - no_result: function () { - if (this.view.options.action.help){ + no_result: function() { + if (this.view.options.action.help) { this.$element.append( $('
') .append($('', { src: '/web_dashboard/static/src/img/view_todo_arrow.png' }))