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:15 UTC
[46/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/a35133a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/a35133a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/a35133a6
Branch: refs/heads/0.8.0
Commit: a35133a69a1e69e0dfde56ce28b55ac151b726fd
Parents: d9e2d04
Author: jiazhong <ji...@ebay.com>
Authored: Fri Apr 10 14:44:13 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Fri May 15 11:39:11 2015 +0800
----------------------------------------------------------------------
webapp/app/js/controllers/cube.js | 4 ++--
webapp/app/js/controllers/modelEdit.js | 4 ++--
webapp/app/js/controllers/query.js | 1 +
webapp/app/partials/query/query.html | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a35133a6/webapp/app/js/controllers/cube.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cube.js b/webapp/app/js/controllers/cube.js
index 8e184d1..55c54f0 100755
--- a/webapp/app/js/controllers/cube.js
+++ b/webapp/app/js/controllers/cube.js
@@ -357,8 +357,8 @@ KylinApp.controller('CubeCtrl', function ($scope, AccessService, MessageService,
});
-var jobSubmitCtrl = function ($scope, $modalInstance, CubeService, MessageService, $location, cube,metaModel, buildType,SweetAlert,loadingRequest) {
- $scope.cube = cube;
+var jobSubmitCtrl = function ($scope, $modalInstance, CubeService, MessageService, $location, cube,metaModel, buildType,SweetAlert,loadingRequest,cubesManager) {
+ $scope.cubesManager = cubesManager;
$scope.metaModel={
model:metaModel.model
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a35133a6/webapp/app/js/controllers/modelEdit.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/modelEdit.js b/webapp/app/js/controllers/modelEdit.js
index c483752..22a9f23 100644
--- a/webapp/app/js/controllers/modelEdit.js
+++ b/webapp/app/js/controllers/modelEdit.js
@@ -117,7 +117,7 @@ KylinApp.controller('ModelEditCtrl', function ($scope, $q, $routeParams, $locati
modelsManager.selectedModel.partition_desc.partition_date_start=null;
}
$scope.state.project = modelsManager.selectedModel.project;
- var _model = angular.copy($scope.model);
+ var _model = angular.copy(modelsManager.selectedModel);
delete _model.project;
$scope.state.modelSchema = angular.toJson(_model, true);
@@ -220,7 +220,7 @@ KylinApp.controller('ModelEditCtrl', function ($scope, $q, $routeParams, $locati
if(modelsManager.selectedModel.partition_desc.partition_date_start==0){
modelsManager.selectedModel.partition_desc.partition_date_start = null;
}
- if($scope.model&&(modelsManager.selectedModel.partition_desc.partition_date_start||modelsManager.selectedModel.partition_desc.partition_date_start==0))
+ if(modelsManager.selectedModel&&(modelsManager.selectedModel.partition_desc.partition_date_start||modelsManager.selectedModel.partition_desc.partition_date_start==0))
{
modelsManager.selectedModel.partition_desc.partition_date_start+=new Date().getTimezoneOffset()*60000;
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a35133a6/webapp/app/js/controllers/query.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/query.js b/webapp/app/js/controllers/query.js
index 10be251..4cf699f 100644
--- a/webapp/app/js/controllers/query.js
+++ b/webapp/app/js/controllers/query.js
@@ -354,6 +354,7 @@ KylinApp
$scope.refreshCurQuery = function () {
$scope.curQuery = this.query;
+
}
$scope.showSavePanel = function () {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a35133a6/webapp/app/partials/query/query.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/query/query.html b/webapp/app/partials/query/query.html
index d34dbc7..7947788 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()">
+ ng-click="refreshCurQuery();$event.stopPropagation();">
{{$index+1}}
<span ng-if="query.status=='failed'">
<i style="color: #f0ad4e" class="fa fa-exclamation-triangle"></i>