You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2016/11/15 19:59:21 UTC
zeppelin git commit: [ZEPPELIN-1688] Display comment of table data
Repository: zeppelin
Updated Branches:
refs/heads/master 65667a34d -> 89f3d72c4
[ZEPPELIN-1688] Display comment of table data
### What is this PR for?
After https://github.com/apache/zeppelin/pull/1529, max number of rows limitation message is not displayed.
### What type of PR is it?
Hot Fix
### Todos
* [x] - display comment of tabledata
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-1668
### How should this be tested?
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: Lee moon soo <mo...@apache.org>
Closes #1642 from Leemoonsoo/ZEPPELIN-1668 and squashes the following commits:
2d8d6ff [Lee moon soo] Display comment of table data
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/89f3d72c
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/89f3d72c
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/89f3d72c
Branch: refs/heads/master
Commit: 89f3d72c4098279aaec83bbc4e4ce22f2df95b54
Parents: 65667a3
Author: Lee moon soo <mo...@apache.org>
Authored: Tue Nov 15 11:27:12 2016 -0800
Committer: Lee moon soo <mo...@apache.org>
Committed: Tue Nov 15 11:59:17 2016 -0800
----------------------------------------------------------------------
zeppelin-web/src/app/notebook/paragraph/paragraph-results.html | 4 ++--
zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/89f3d72c/zeppelin-web/src/app/notebook/paragraph/paragraph-results.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph-results.html b/zeppelin-web/src/app/notebook/paragraph/paragraph-results.html
index 95bd6a4..3a491d4 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph-results.html
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph-results.html
@@ -21,8 +21,8 @@ limitations under the License.
<div id="{{paragraph.id}}_comment"
class="text"
- ng-if="getResultType()=='TABLE' && paragraph.result.comment"
- ng-bind-html="paragraph.result.comment">
+ ng-if="getResultType()=='TABLE' && tableDataComment"
+ ng-bind-html="tableDataComment">
</div>
<div id="{{paragraph.id}}_text"
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/89f3d72c/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 4443dbf..b46dc33 100644
--- a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
+++ b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
@@ -200,6 +200,7 @@
tableData = new TableData();
tableData.loadParagraphResult($scope.paragraph.result);
$scope.tableDataColumns = tableData.columns;
+ $scope.tableDataComment = tableData.comment;
$scope.setGraphMode($scope.getGraphMode(), false, false);
} else if ($scope.getResultType() === 'HTML') {
$scope.renderHtml();
@@ -1710,6 +1711,7 @@
tableData = new TableData();
tableData.loadParagraphResult($scope.paragraph.result);
$scope.tableDataColumns = tableData.columns;
+ $scope.tableDataComment = tableData.comment;
clearUnknownColsFromGraphOption();
selectDefaultColsForGraphOption();
}