Repository: kylin Updated Branches: refs/heads/master 38dfbb3ef -> 07d892124
KYLIN-2174 minor fix partition column format not visible issue Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/07d89212 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/07d89212 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/07d89212 Branch: refs/heads/master Commit: 07d892124231d1ad413f73b7e6a2da0428157107 Parents: 38dfbb3 Author: zhongjian <jiat...@163.com> Authored: Mon Nov 14 17:48:12 2016 +0800 Committer: zhongjian <jiat...@163.com> Committed: Mon Nov 14 17:48:12 2016 +0800 ---------------------------------------------------------------------- webapp/app/js/controllers/modelEdit.js | 25 ++++++++------------ .../modelDesigner/conditions_settings.html | 7 +++--- 2 files changed, 14 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/07d89212/webapp/app/js/controllers/modelEdit.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/modelEdit.js b/webapp/app/js/controllers/modelEdit.js index d628a0f..0b3db66 100644 --- a/webapp/app/js/controllers/modelEdit.js +++ b/webapp/app/js/controllers/modelEdit.js @@ -69,11 +69,11 @@ KylinApp.controller('ModelEditCtrl', function ($scope, $q, $routeParams, $locati return type; }; - $scope.isFormatVisible = false; - var judgeFormatVisible = function(dateColumn){ + $scope.isFormatEditable = false; + var judgeFormatEditable = function(dateColumn){ if(dateColumn == null){ - $scope.isFormatVisible = false; + $scope.isFormatEditable = false; return; } var column = _.filter($scope.getColumnsByTable($scope.modelsManager.selectedModel.fact_table),function(_column){ @@ -84,7 +84,7 @@ KylinApp.controller('ModelEditCtrl', function ($scope, $q, $routeParams, $locati var data_type = column[0].datatype; if(data_type ==="bigint" ||data_type ==="int" ||data_type ==="integer"){ - $scope.isFormatVisible = false; + $scope.isFormatEditable = false; $scope.modelsManager.selectedModel.partition_desc.partition_date_format='yyyyMMdd'; $scope.partitionColumn.hasSeparateTimeColumn=false; $scope.modelsManager.selectedModel.partition_desc.partition_time_column=null; @@ -93,12 +93,12 @@ KylinApp.controller('ModelEditCtrl', function ($scope, $q, $routeParams, $locati return; } - $scope.isFormatVisible = true; + $scope.isFormatEditable = true; return; }; $scope.partitionChange = function (dateColumn) { - judgeFormatVisible(dateColumn); + judgeFormatEditable(dateColumn); }; // ~ Define data @@ -127,16 +127,11 @@ KylinApp.controller('ModelEditCtrl', function ($scope, $q, $routeParams, $locati if(!ProjectModel.getSelectedProject()){ ProjectModel.setSelectedProject(modelsManager.selectedModel.project); - TableModel.aceSrcTbLoaded().then(function(){ - judgeFormatVisible($scope.modelsManager.selectedModel.partition_desc.partition_date_column); - }); - - }else{ - if($scope.modelsManager.selectedModel.partition_desc.partition_date_column){ - judgeFormatVisible($scope.modelsManager.selectedModel.partition_desc.partition_date_column); - - } } + + TableModel.aceSrcTbLoaded().then(function(){ + judgeFormatEditable($scope.modelsManager.selectedModel.partition_desc.partition_date_column); + }); } }); //init project http://git-wip-us.apache.org/repos/asf/kylin/blob/07d89212/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 9fdb294..6e7a883 100644 --- a/webapp/app/partials/modelDesigner/conditions_settings.html +++ b/webapp/app/partials/modelDesigner/conditions_settings.html @@ -60,14 +60,15 @@ </div> <!--Date Format--> - <div class="form-group" ng-if="(state.mode=='edit'&&isFormatVisible==true) || (state.mode=='view')"> + <div class="form-group" ng-if="(state.mode=='edit') || (state.mode=='view')"> <div class="row"> <label class="control-label col-xs-12 col-sm-3 no-padding-right font-color-default"><b>Date Format</b></label> <div class="col-xs-12 col-sm-6"> <select style="width: 100%" chosen ng-required="modelsManager.selectedModel.partition_desc.partition_date_format" ng-model="modelsManager.selectedModel.partition_desc.partition_date_format" - ng-if="state.mode=='edit'&&isFormatVisible==true" + ng-if="state.mode=='edit'" + ng-disabled="isFormatEditable!==true" data-placement="" ng-options="ddt as ddt for ddt in cubeConfig.partitionDateFormatOpt"> <option value="">--Select Date Format--</option> @@ -78,7 +79,7 @@ </div> <!--Date Format--> - <div class="form-group middle-popover" ng-if="isFormatVisible==true"> + <div class="form-group middle-popover" ng-if="isFormatEditable==true"> <div class="row"> <label class="control-label col-xs-12 col-sm-3 no-padding-right font-color-default"><b>Has a separate "time of the day" column ?</b> <i kylinpopover placement="right" title="Separate Time Column" template="separateTimeColumnTip.html" class="fa fa-info-circle"></i></label> <div class="col-xs-12 col-sm-6">
