From a455af2e78e7f5eb5c2761234c6897d3428e1d34 Mon Sep 17 00:00:00 2001 From: "vda (OpenERP)" Date: Thu, 28 Apr 2011 11:01:43 +0530 Subject: [PATCH] [fix] Remove empty column if widget is found. bzr revid: vda@tinyerp.com-20110428053143-42jsffz31m0p6i27 --- .../lib/jquery.dashboard/js/jquery.dashboard.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/addons/base_dashboard/static/lib/jquery.dashboard/js/jquery.dashboard.js b/addons/base_dashboard/static/lib/jquery.dashboard/js/jquery.dashboard.js index 32aac9ffa85..5f6afc7ce7d 100644 --- a/addons/base_dashboard/static/lib/jquery.dashboard/js/jquery.dashboard.js +++ b/addons/base_dashboard/static/lib/jquery.dashboard/js/jquery.dashboard.js @@ -164,10 +164,6 @@ }); } else { // set the layout -// var currentLayout; -// if(typeof dashboard.layout != 'undefined') { -// currentLayout = dashboard.layout -// } var currentLayout = (typeof dashboard.layout != 'undefined') ? dashboard.layout : getLayout(opts.json_data.layout); dashboard.setLayout(currentLayout); dashboard.loadWidgets(opts.json_data.data); @@ -196,7 +192,10 @@ // add it to the column wi.appendTo(column); - + + if(column.find('.emptycolumn').length) + column.find('.emptycolumn').remove(); + dashboard.widgets[wid] = widget({ id: wid, element: wi, @@ -843,7 +842,6 @@ $.fn.dashboard.defaults = { debuglevel:3, json_data: {}, - simple_data: {}, loadingHtml: '
Loading, please wait

Loading...

', emptyColumnHtml: 'Drag your widgets here', widgetTemplate: 'widgettemplate', @@ -935,4 +933,4 @@ // Provide some basic currying to the user return data ? fn( data ) : fn; }; -})(); +})(); \ No newline at end of file