You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by co...@apache.org on 2016/07/19 01:43:22 UTC
zeppelin git commit: ZEPPELIN-1170 Handsontable fails to display data
on second run
Repository: zeppelin
Updated Branches:
refs/heads/master 74347c22f -> 8ffd9af93
ZEPPELIN-1170 Handsontable fails to display data on second run
### What is this PR for?
Handsontable fails to display data on second run if first run did not render table due to an error in the query.
Fix for a render issue caused by #1059
### What type of PR is it?
Bug Fix
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-1170
### How should this be tested?
Please ref the screenshots
### Screenshots (if appropriate)
**Before**
**After**
### Questions:
* Does the licenses files need update? n/a
* Is there breaking changes for older versions? n/a
* Does this needs documentation? n/a
Author: Renjith Kamath <re...@gmail.com>
Closes #1182 from r-kamath/ZEPPELIN-1170 and squashes the following commits:
6f0f591 [Renjith Kamath] Merge remote-tracking branch 'upstream/master' into ZEPPELIN-1170
d63d517 [Renjith Kamath] ZEPPELIN-1170 Handsontable fails to display data on second run
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/8ffd9af9
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/8ffd9af9
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/8ffd9af9
Branch: refs/heads/master
Commit: 8ffd9af93eeb5ceaee7f70828e2327bc6d776600
Parents: 74347c2
Author: Renjith Kamath <re...@gmail.com>
Authored: Wed Jul 13 23:58:53 2016 +0530
Committer: Damien CORNEAU <co...@gmail.com>
Committed: Tue Jul 19 10:43:05 2016 +0900
----------------------------------------------------------------------
.../notebook/paragraph/paragraph.controller.js | 67 +++++++++-----------
1 file changed, 29 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/8ffd9af9/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
index a968e08..abf2a3d 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
@@ -1283,49 +1283,40 @@ angular.module('zeppelinWebApp').controller('ParagraphCtrl', function($scope, $r
var resultRows = data.rows;
var columnNames = _.pluck(data.columnNames, 'name');
- // on chart type change, destroy table to force reinitialization.
if ($scope.hot) {
$scope.hot.destroy();
- $scope.hot = null;
- }
-
- // create table if not exists.
- if (!$scope.hot) {
- $scope.hot = new Handsontable(container, {
- rowHeaders: false,
- stretchH: 'all',
- sortIndicator: true,
- columnSorting: true,
- contextMenu: false,
- manualColumnResize: true,
- manualRowResize: true,
- readOnly: true,
- readOnlyCellClassName: '', // don't apply any special class so we can retain current styling
- fillHandle: false,
- fragmentSelection: true,
- disableVisualSelection: true,
- cells: function(row, col, prop) {
- var cellProperties = {};
- cellProperties.renderer = function(instance, td, row, col, prop, value, cellProperties) {
- if (!isNaN(value)) {
- cellProperties.format = '0,0.[00000]';
- td.style.textAlign = 'left';
- Handsontable.renderers.NumericRenderer.apply(this, arguments);
- } else if (value.length > '%html'.length && '%html ' === value.substring(0, '%html '.length)) {
- td.innerHTML = value.substring('%html'.length);
- } else {
- Handsontable.renderers.TextRenderer.apply(this, arguments);
- }
- };
- return cellProperties;
- }
- });
}
- // load data into table.
- $scope.hot.updateSettings({
+ $scope.hot = new Handsontable(container, {
colHeaders: columnNames,
- data: resultRows
+ data: resultRows,
+ rowHeaders: false,
+ stretchH: 'all',
+ sortIndicator: true,
+ columnSorting: true,
+ contextMenu: false,
+ manualColumnResize: true,
+ manualRowResize: true,
+ readOnly: true,
+ readOnlyCellClassName: '', // don't apply any special class so we can retain current styling
+ fillHandle: false,
+ fragmentSelection: true,
+ disableVisualSelection: true,
+ cells: function(row, col, prop) {
+ var cellProperties = {};
+ cellProperties.renderer = function(instance, td, row, col, prop, value, cellProperties) {
+ if (!isNaN(value)) {
+ cellProperties.format = '0,0.[00000]';
+ td.style.textAlign = 'left';
+ Handsontable.renderers.NumericRenderer.apply(this, arguments);
+ } else if (value.length > '%html'.length && '%html ' === value.substring(0, '%html '.length)) {
+ td.innerHTML = value.substring('%html'.length);
+ } else {
+ Handsontable.renderers.TextRenderer.apply(this, arguments);
+ }
+ };
+ return cellProperties;
+ }
});
};