kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From liy...@apache.org
Subject [04/50] [abbrv] incubator-kylin git commit: update doc, consume rest api in js , and tables page update
Date Thu, 03 Sep 2015 01:31:19 GMT
update doc,consume rest api in js ,and tables page update


Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/4ab6372c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/4ab6372c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/4ab6372c

Branch: refs/heads/0.7
Commit: 4ab6372c88282831308443938155e7758f8bbba0
Parents: 265a528
Author: jiazhong <jiazhong@ebay.com>
Authored: Mon Aug 17 15:21:55 2015 +0800
Committer: jiazhong <jiazhong@ebay.com>
Committed: Mon Aug 17 15:22:33 2015 +0800

----------------------------------------------------------------------
 webapp/app/js/controllers/sourceMeta.js           | 6 ++++++
 webapp/app/partials/tables/source_table_tree.html | 2 +-
 website/_docs/howto/howto_use_restapi_in_js.md    | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4ab6372c/webapp/app/js/controllers/sourceMeta.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/sourceMeta.js b/webapp/app/js/controllers/sourceMeta.js
index d05dc7f..554e128 100755
--- a/webapp/app/js/controllers/sourceMeta.js
+++ b/webapp/app/js/controllers/sourceMeta.js
@@ -76,6 +76,12 @@ KylinApp
       }
     };
 
+    $scope.selectedNode = function(obj){
+      if (obj.uuid) {
+        return $scope.tableModel.selectedSrcTable;
+      }
+    }
+
     $scope.aceSrcTbChanged = function () {
       $scope.tableModel.selectedSrcDb = [];
       $scope.tableModel.selectedSrcTable = {};

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4ab6372c/webapp/app/partials/tables/source_table_tree.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/tables/source_table_tree.html b/webapp/app/partials/tables/source_table_tree.html
index 2b40ab1..1e6e08f 100755
--- a/webapp/app/partials/tables/source_table_tree.html
+++ b/webapp/app/partials/tables/source_table_tree.html
@@ -39,7 +39,7 @@
                      tree-model="tableModel.selectedSrcDb"
                      options="tableModel.treeOptions"
                      on-selection="showSelected(node)"
-                     selected-node="tableModel.selectedSrcTable">
+                     selected-node="selectedNode(node)">
             {{node.name}} {{!!(node.datatype)?'(' + trimType(node.datatype) + ')' : ''}}
         </treecontrol>
     </div>

http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4ab6372c/website/_docs/howto/howto_use_restapi_in_js.md
----------------------------------------------------------------------
diff --git a/website/_docs/howto/howto_use_restapi_in_js.md b/website/_docs/howto/howto_use_restapi_in_js.md
index 54b2c3e..45c8974 100644
--- a/website/_docs/howto/howto_use_restapi_in_js.md
+++ b/website/_docs/howto/howto_use_restapi_in_js.md
@@ -16,7 +16,7 @@ $.ajaxSetup({
     var request = $.ajax({
        url: "http://hostname/kylin/api/query",
        type: "POST",
-       data: '{"sql":"select count(*) from SUMMARY;","offset":0,"limit":50000,"partial":true,"project":"test"}',
+       data: '{"sql":"select count(*) from SUMMARY;","offset":0,"limit":50000,"acceptPartial":true,"project":"test"}',
        dataType: "json"
     });
     request.done(function( msg ) {


Mime
View raw message