From 162eb4ca35d1ffe5e88ea25076bb02e7341f46df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Mon, 15 Dec 2014 15:21:29 +0100 Subject: [PATCH] Panel: duplicate now always adds the duplicated panel on the same row instead of creating a new row, Closes #1185 --- src/app/services/dashboard/dashboardSrv.js | 14 ++------------ src/test/specs/dashboardSrv-specs.js | 10 ---------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/src/app/services/dashboard/dashboardSrv.js b/src/app/services/dashboard/dashboardSrv.js index e8f0a808279..21789fc1740 100644 --- a/src/app/services/dashboard/dashboardSrv.js +++ b/src/app/services/dashboard/dashboardSrv.js @@ -117,18 +117,8 @@ function (angular, $, kbn, _, moment) { var newPanel = angular.copy(panel); newPanel.id = this.getNextPanelId(); - while(rowIndex < this.rows.length) { - var currentRow = this.rows[rowIndex]; - if (this.rowSpan(currentRow) <= 9) { - currentRow.panels.push(newPanel); - return; - } - rowIndex++; - } - - var newRow = angular.copy(row); - newRow.panels = [newPanel]; - this.rows.push(newRow); + var currentRow = this.rows[rowIndex]; + currentRow.panels.push(newPanel); }; p.formatDate = function(date, format) { diff --git a/src/test/specs/dashboardSrv-specs.js b/src/test/specs/dashboardSrv-specs.js index b2f33ac133a..18eb13d3a18 100644 --- a/src/test/specs/dashboardSrv-specs.js +++ b/src/test/specs/dashboardSrv-specs.js @@ -70,16 +70,6 @@ define([ expect(dashboard.rows[0].panels[1].id).to.be(11); }); - it('duplicate should add row if there is no space left', function() { - var panel = { span: 12, attr: '123' }; - dashboard.rows = [{ panels: [panel] }]; - dashboard.duplicatePanel(panel, dashboard.rows[0]); - - expect(dashboard.rows[0].panels[0].span).to.be(12); - expect(dashboard.rows[0].panels.length).to.be(1); - expect(dashboard.rows[1].panels[0].attr).to.be('123'); - }); - }); describe('when creating dashboard with editable false', function() {