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 2016/09/12 11:21:01 UTC
[13/35] kylin git commit: KYLIN-1996 Keep original column order when
designing cube
KYLIN-1996 Keep original column order when designing cube
Signed-off-by: Jason <ji...@163.com>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/e87c816d
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/e87c816d
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/e87c816d
Branch: refs/heads/1.5.x-HBase1.x
Commit: e87c816dd7099290220ca09361f9ca04c36a317e
Parents: bf26114
Author: chenzhx <34...@qq.com>
Authored: Fri Sep 9 10:55:36 2016 +0800
Committer: Jason <ji...@163.com>
Committed: Fri Sep 9 15:52:48 2016 +0800
----------------------------------------------------------------------
webapp/app/js/controllers/cubeDimensions.js | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/e87c816d/webapp/app/js/controllers/cubeDimensions.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeDimensions.js b/webapp/app/js/controllers/cubeDimensions.js
index 1663b5c..ab07451 100644
--- a/webapp/app/js/controllers/cubeDimensions.js
+++ b/webapp/app/js/controllers/cubeDimensions.js
@@ -67,20 +67,17 @@ KylinApp.controller('CubeDimensionsCtrl', function ($scope, $modal,MetaModel,cub
var cols = $scope.getDimColumnsByTable(factTable);
// Initialize selected available.
- var factAvailable = {};
var factSelectAvailable = {};
for (var i = 0; i < cols.length; i++) {
cols[i].table = factTable;
cols[i].isLookup = false;
- factAvailable[cols[i].name] = cols[i];
-
// Default not selected and not disabled.
factSelectAvailable[cols[i].name] = {selected: false, disabled: false};
}
- $scope.availableColumns[factTable] = factAvailable;
+ $scope.availableColumns[factTable] = cols;
$scope.selectedColumns[factTable] = factSelectAvailable;
$scope.availableTables.push(factTable);
@@ -91,20 +88,17 @@ KylinApp.controller('CubeDimensionsCtrl', function ($scope, $modal,MetaModel,cub
var cols2 = $scope.getDimColumnsByTable(lookups[j].table);
// Initialize selected available.
- var lookupAvailable = {};
var lookupSelectAvailable = {};
for (var k = 0; k < cols2.length; k++) {
cols2[k].table = lookups[j].table;
cols2[k].isLookup = true;
- lookupAvailable[cols2[k].name] = cols2[k];
-
// Default not selected and not disabled.
lookupSelectAvailable[cols2[k].name] = {selected: false, disabled: false};
}
- $scope.availableColumns[lookups[j].table] = lookupAvailable;
+ $scope.availableColumns[lookups[j].table] = cols2;
$scope.selectedColumns[lookups[j].table] = lookupSelectAvailable;
if($scope.availableTables.indexOf(lookups[j].table)==-1){
$scope.availableTables.push(lookups[j].table);