You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2017/02/23 03:33:54 UTC
[1/2] kylin git commit: KYLIN-1875,change model limit remove
Repository: kylin
Updated Branches:
refs/heads/master 82f68035c -> 37aab3c69
KYLIN-1875,change model limit remove
Signed-off-by: Li Yang <li...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/77df9dc1
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/77df9dc1
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/77df9dc1
Branch: refs/heads/master
Commit: 77df9dc190c16a3b00c325b245c346722e65eaeb
Parents: 82f6803
Author: luguosheng <55...@qq.com>
Authored: Wed Feb 22 18:24:14 2017 +0800
Committer: Li Yang <li...@apache.org>
Committed: Thu Feb 23 11:32:13 2017 +0800
----------------------------------------------------------------------
webapp/app/js/controllers/cubeEdit.js | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/77df9dc1/webapp/app/js/controllers/cubeEdit.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js
index 31b84f4..0e5038e 100755
--- a/webapp/app/js/controllers/cubeEdit.js
+++ b/webapp/app/js/controllers/cubeEdit.js
@@ -704,9 +704,11 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
$scope.metaModel.model = modelsManager.getModel(newValue);
if($scope.metaModel.model){
$scope.modelsManager.initAliasMapByModelSchema($scope.metaModel);
- $scope.cubeMetaFrame=CubeDescModel.createNew({
- model_name:newValue
- })
+ //if(oldValue){
+ // $scope.cubeMetaFrame=CubeDescModel.createNew({
+ // model_name:newValue
+ // })
+ //}
}
if(!$scope.metaModel.model){
return;
[2/2] kylin git commit: KYLIN 1875 table alias modify
Posted by li...@apache.org.
KYLIN 1875 table alias modify
Signed-off-by: Li Yang <li...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/37aab3c6
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/37aab3c6
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/37aab3c6
Branch: refs/heads/master
Commit: 37aab3c69ef78633367718a5fd85caa398820f2f
Parents: 77df9dc
Author: chenzhx <34...@qq.com>
Authored: Wed Feb 22 17:32:14 2017 +0800
Committer: Li Yang <li...@apache.org>
Committed: Thu Feb 23 11:32:29 2017 +0800
----------------------------------------------------------------------
webapp/app/js/controllers/modelDataModel.js | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/37aab3c6/webapp/app/js/controllers/modelDataModel.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/modelDataModel.js b/webapp/app/js/controllers/modelDataModel.js
index cb3305a..15fb20a 100644
--- a/webapp/app/js/controllers/modelDataModel.js
+++ b/webapp/app/js/controllers/modelDataModel.js
@@ -95,13 +95,9 @@ KylinApp.controller('ModelDataModelCtrl', function ($location,$scope, $modal,cub
};
$scope.$watch('newLookup.alias',function(newValue,oldValue){
- if(!newValue){
- return;
- }else{
- for(var i=0;i<$scope.newLookup.join.primary_key.length;i++){
- $scope.newLookup.join.primary_key[i] = $scope.newLookup.join.primary_key[i].replace(oldValue+'.',newValue+'.');
+ for(var i=0;i<$scope.newLookup.join.primary_key.length;i++){
+ $scope.newLookup.join.primary_key[i] = $scope.newLookup.join.primary_key[i].replace(/^.*?\./,newValue+'.');
}
- }
});
$scope.editLookup = function (lookup) {
$scope.lookupState.editingIndex = lookupList.indexOf(lookup);