Commit 162eb4ca by Torkel Ödegaard

Panel: duplicate now always adds the duplicated panel on the same row instead of…

Panel: duplicate now always adds the duplicated panel on the same row instead of creating a new row, Closes #1185
parent 2f18444a
......@@ -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) {
......
......@@ -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() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment