You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2015/05/15 07:22:18 UTC
[49/52] [abbrv] incubator-kylin git commit: KYLIN-675
KYLIN-675
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/570d5a85
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/570d5a85
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/570d5a85
Branch: refs/heads/0.8.0
Commit: 570d5a856d2510278b31f7fa70f4a757e8aa0d43
Parents: 2dda4e1
Author: jiazhong <ji...@ebay.com>
Authored: Fri Apr 10 14:48:32 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Fri May 15 11:39:12 2015 +0800
----------------------------------------------------------------------
webapp/app/js/controllers/cube.js | 4 ++--
webapp/app/js/controllers/cubeModel.js | 4 ++--
webapp/app/js/services/tree.js | 2 +-
.../partials/modelDesigner/conditions_settings.html | 4 ++--
webapp/app/partials/query/query.html | 2 +-
webapp/app/partials/query/query_detail.html | 15 ++++++---------
webapp/app/routes.json | 15 ---------------
7 files changed, 14 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/570d5a85/webapp/app/js/controllers/cube.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cube.js b/webapp/app/js/controllers/cube.js
index 55c54f0..f53b590 100755
--- a/webapp/app/js/controllers/cube.js
+++ b/webapp/app/js/controllers/cube.js
@@ -18,7 +18,7 @@
'use strict';
-KylinApp.controller('CubeCtrl', function ($scope, AccessService, MessageService, CubeService, TableService, GraphService, UserService,SweetAlert,loadingRequest,modelsManager,$modal,cubesManager) {
+KylinApp.controller('CubeCtrl', function ($scope, AccessService, MessageService, CubeService, TableService, ModelGraphService, UserService,SweetAlert,loadingRequest,modelsManager,$modal,cubesManager) {
$scope.newAccess = null;
$scope.state = {jsonEdit: false};
@@ -26,7 +26,7 @@ KylinApp.controller('CubeCtrl', function ($scope, AccessService, MessageService,
$scope.cubesManager = cubesManager;
$scope.buildGraph = function (cube) {
- GraphService.buildTree(cube);
+ ModelGraphService.buildTree(cube);
};
$scope.getCubeSql = function (cube) {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/570d5a85/webapp/app/js/controllers/cubeModel.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeModel.js b/webapp/app/js/controllers/cubeModel.js
index dd7991d..9466f18 100644
--- a/webapp/app/js/controllers/cubeModel.js
+++ b/webapp/app/js/controllers/cubeModel.js
@@ -18,14 +18,14 @@
'use strict';
-KylinApp.controller('CubeModelCtrl', function ($scope, $modal,cubeConfig,MetaModel,SweetAlert,GraphService,$log,TableModel,ModelService,loadingRequest,modelsManager) {
+KylinApp.controller('CubeModelCtrl', function ($scope, $modal,cubeConfig,MetaModel,SweetAlert,ModelGraphService,$log,TableModel,ModelService,loadingRequest,modelsManager) {
$scope.modelsManager = modelsManager;
$scope.buildGraph = function (model) {
// var newModel = jQuery.extend(true, {}, model);
var newModel = angular.copy(model);
- GraphService.buildTree(newModel);
+ ModelGraphService.buildTree(newModel);
};
$scope.cleanStatus = function(model){
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/570d5a85/webapp/app/js/services/tree.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/services/tree.js b/webapp/app/js/services/tree.js
index d61629c..acc4626 100755
--- a/webapp/app/js/services/tree.js
+++ b/webapp/app/js/services/tree.js
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-KylinApp.service('GraphService', function () {
+KylinApp.service('ModelGraphService', function () {
var margin = {top: 20, right: 100, bottom: 20, left: 100},
width = 1100 - margin.right - margin.left,
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/570d5a85/webapp/app/partials/modelDesigner/conditions_settings.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/modelDesigner/conditions_settings.html b/webapp/app/partials/modelDesigner/conditions_settings.html
index d066930..b27bae3 100644
--- a/webapp/app/partials/modelDesigner/conditions_settings.html
+++ b/webapp/app/partials/modelDesigner/conditions_settings.html
@@ -131,8 +131,8 @@
<div class="row">
<div class="col-xs-12">
<ol class="text-info">
- <li>Not required,leave as default if cube always need full build</li>
- <li>Partition column will select 'date' or 'string' type column from fact table</li>
+ <li>Partition date column not required,leave as default if cube always need full build</li>
+ <li>Partition date column will select 'date' or 'string' type column from fact table</li>
</ol>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/570d5a85/webapp/app/partials/query/query.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/query/query.html b/webapp/app/partials/query/query.html
index 7947788..d34dbc7 100644
--- a/webapp/app/partials/query/query.html
+++ b/webapp/app/partials/query/query.html
@@ -193,7 +193,7 @@
class="{{(query==curQuery)? 'active':''}}">
<span>
<button class="btn {{(query==curQuery)?'active':''}} btn-default btn-xs" style="width: 50px"
- ng-click="refreshCurQuery();$event.stopPropagation();">
+ ng-click="refreshCurQuery()">
{{$index+1}}
<span ng-if="query.status=='failed'">
<i style="color: #f0ad4e" class="fa fa-exclamation-triangle"></i>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/570d5a85/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 7157e9c..9217257 100644
--- a/webapp/app/partials/query/query_detail.html
+++ b/webapp/app/partials/query/query_detail.html
@@ -82,17 +82,15 @@
</button>
</span>
<div class="pull-right" ng-if="curQuery.status=='success'">
- <button class="btn btn-default btn-xs"
- ng-click="curQuery.graph.show=!curQuery.graph.show;buildGraphMetadata(curQuery);resetGraph(curQuery);refreshGraphData(curQuery)">
+ <button class="btn btn-default btn-xs" ng-click="curQuery.graph.show=!curQuery.graph.show;buildGraphMetadata(curQuery);resetGraph(curQuery);refreshGraphData(curQuery)">
<span ng-if="!curQuery.graph.show"><i class="fa fa-bar-chart-o"></i> Visualization</span>
<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
- class="fa fa-cloud-download"></i> Export</a>
- <a class="btn btn-default btn-xs"
- ng-click="refreshUi();"><i
- ng-class="{true: 'fa fa-compress', false: 'fa fa-expand'}[ui.fullScreen]"></i></a>
+ <a class="btn btn-default btn-xs" href="{{config.service.url}}query/format/csv?sql={{sanitate(curQuery.sql)}}&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 ng-class="{true: 'fa fa-compress', false: 'fa fa-expand'}[ui.fullScreen]"></i>
+ </a>
</div>
<div ng-if="!curQuery.graph.show">
@@ -139,7 +137,6 @@
<div class="graph_content">
<label>Dimensions</label>
-
<div>
<select
chosen style="width: 100%"
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/570d5a85/webapp/app/routes.json
----------------------------------------------------------------------
diff --git a/webapp/app/routes.json b/webapp/app/routes.json
index 1accb01..3121123 100644
--- a/webapp/app/routes.json
+++ b/webapp/app/routes.json
@@ -1,20 +1,5 @@
[
{
- "url": "/home",
- "params": {
- "templateUrl": "partials/home.html",
- "controller": "IndexCtrl"
- }
- },
- {
- "url": "/cubes",
- "params": {
- "templateUrl": "partials/cubes/cubes.html",
- "tab": "models",
- "controller": "CubesCtrl"
- }
- },
- {
"url": "/jobs",
"params": {
"templateUrl": "partials/jobs/jobs.html",