Repository: kylin Updated Branches: refs/heads/1.x-staging 677e5653e -> 2b7ae8492
KYLIN-1472 special character cause export query result failed, fixed by @nichunen Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/2b7ae849 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/2b7ae849 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/2b7ae849 Branch: refs/heads/1.x-staging Commit: 2b7ae84925201b14657a0a876e7110cf9b97a4fc Parents: 677e565 Author: Jason <jiat...@163.com> Authored: Thu Mar 10 10:09:15 2016 +0800 Committer: Jason <jiat...@163.com> Committed: Thu Mar 10 10:09:15 2016 +0800 ---------------------------------------------------------------------- webapp/app/js/controllers/query.js | 4 +++- webapp/app/partials/query/query_detail.html | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/2b7ae849/webapp/app/js/controllers/query.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/query.js b/webapp/app/js/controllers/query.js index 785d07e..cc6612e 100644 --- a/webapp/app/js/controllers/query.js +++ b/webapp/app/js/controllers/query.js @@ -26,6 +26,7 @@ KylinApp $scope.queryString = ""; $scope.queries = []; $scope.curQuery = null; + $scope.exportSql = null; $scope.dateTypes = [91, 92, 93]; $scope.stringTypes = [-1, 1, 12]; $scope.numberTypes = [-7, -6, -5, 3, 4, 5, 6, 7, 8]; @@ -240,7 +241,7 @@ KylinApp } $scope.sanitate = function (sql) { - return sql.replace(/\n/g, " "); + return encodeURIComponent(sql.replace(/\n/g, " ")); } $scope.query = function (query) { @@ -278,6 +279,7 @@ KylinApp $scope.curQuery = newQuery; $scope.query($scope.curQuery); $scope.cacheQuery($scope.curQuery); + $scope.exportSql = $scope.sanitate(sql); } $scope.reset = function (query) { http://git-wip-us.apache.org/repos/asf/kylin/blob/2b7ae849/webapp/app/partials/query/query_detail.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/query/query_detail.html b/webapp/app/partials/query/query_detail.html index 42f8dbb..c76b407 100644 --- a/webapp/app/partials/query/query_detail.html +++ b/webapp/app/partials/query/query_detail.html @@ -88,7 +88,7 @@ <span ng-if="curQuery.graph.show"><i class="fa fa-list-ul"></i> Grid</span> </button> <a class="btn btn-default btn-xs" - href="{{config.service.url}}query/format/csv?sql={{sanitate(curQuery.sql)}}&project={{curQuery.project}}" target="_blank"><i + href="{{config.service.url}}query/format/csv?sql={{exportSql}}&project={{curQuery.project}}" target="_blank"><i class="fa fa-cloud-download"></i> Export</a> <a class="btn btn-default btn-xs" ng-click="refreshUi();"><i