Repository: kylin Updated Branches: refs/heads/2.x-staging 406127ac8 -> 45ec2c6c6
minor, UI ModelDesigner model dimension page close-on-select update Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/45ec2c6c Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/45ec2c6c Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/45ec2c6c Branch: refs/heads/2.x-staging Commit: 45ec2c6c60666acf8d7cf6759a1f51eaa8096154 Parents: 406127a Author: janzhongi <jiazh...@ebay.com> Authored: Fri Feb 19 18:57:04 2016 +0800 Committer: janzhongi <jiazh...@ebay.com> Committed: Fri Feb 19 18:57:04 2016 +0800 ---------------------------------------------------------------------- webapp/app/js/controllers/modelDimensions.js | 10 ---------- webapp/app/partials/modelDesigner/model_dimensions.html | 8 +++----- 2 files changed, 3 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/45ec2c6c/webapp/app/js/controllers/modelDimensions.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/modelDimensions.js b/webapp/app/js/controllers/modelDimensions.js index dfe30b8..1b0e889 100644 --- a/webapp/app/js/controllers/modelDimensions.js +++ b/webapp/app/js/controllers/modelDimensions.js @@ -58,16 +58,6 @@ KylinApp.controller('ModelDimensionsCtrl', function ($scope, $modal,MetaModel,mo this.columns = []; } - $scope.refreshModelDimensions = function (list, index, dimension) { - if (dimension) { - list[index].columns.length = dimension.columns.length; - for(var i=0;i<dimension.columns.length;i++){ - list[index].columns[i] = dimension.columns[i]; - } - } - - }; - // Initialize data for columns widget in auto-gen when add/edit cube. if ($scope.state.mode == 'edit') { http://git-wip-us.apache.org/repos/asf/kylin/blob/45ec2c6c/webapp/app/partials/modelDesigner/model_dimensions.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/modelDesigner/model_dimensions.html b/webapp/app/partials/modelDesigner/model_dimensions.html index 2b298c5..641afb9 100644 --- a/webapp/app/partials/modelDesigner/model_dimensions.html +++ b/webapp/app/partials/modelDesigner/model_dimensions.html @@ -60,7 +60,7 @@ <th class="col-xs-9">Columns</th> </tr> - <tr ng-repeat="dimension in modelsManager.selectedModel.dimensions track by $index" class="row"> + <tr ng-repeat="dimension in modelsManager.selectedModel.dimensions" class="row"> <td class="col-xs-1"> <!-- ID --> <b>{{($index + 1)}}</b> @@ -70,12 +70,10 @@ </td> <td class="col-xs-9"> <ui-select - close-on-select="false" ng-if="state.mode=='edit'" style="width: 100%" autofocus="true" - on-select="refreshModelDimensions(modelsManager.selectedModel.dimensions,$index,dimension)" - on-remove="refreshModelDimensions(modelsManager.selectedModel.dimensions,$index,dimension)" - ng-model="dimension.columns" multiple> + close-on-select="false" + ng-model="modelsManager.selectedModel.dimensions[$index].columns" multiple> <ui-select-match placeholder="Select Column...">{{$item.name}}</ui-select-match> <ui-select-choices repeat="column.name as column in getColumnsByTable(dimension.table) | filter:$select.search">