KYLIN-1698-INT Signed-off-by: Jason <jiat...@163.com>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/413bc9f2 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/413bc9f2 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/413bc9f2 Branch: refs/heads/master Commit: 413bc9f2d6c73c3c4822ba3ce0ab9da405cd5b9c Parents: e3a1767 Author: chenzhx <346839...@qq.com> Authored: Wed Sep 7 13:48:21 2016 +0800 Committer: Jason <jiat...@163.com> Committed: Wed Sep 7 15:49:31 2016 +0800 ---------------------------------------------------------------------- webapp/app/js/controllers/modelEdit.js | 7 +++++-- webapp/app/partials/modelDesigner/conditions_settings.html | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/413bc9f2/webapp/app/js/controllers/modelEdit.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/modelEdit.js b/webapp/app/js/controllers/modelEdit.js index 2532fb4..65e17fa 100644 --- a/webapp/app/js/controllers/modelEdit.js +++ b/webapp/app/js/controllers/modelEdit.js @@ -35,7 +35,7 @@ KylinApp.controller('ModelEditCtrl', function ($scope, $q, $routeParams, $locati $scope.getPartitonColumns = function(tableName){ var columns = _.filter($scope.getColumnsByTable(tableName),function(column){ - return column.datatype==="date"||column.datatype==="timestamp"||column.datatype==="string"||column.datatype.startsWith("varchar")||column.datatype==="bigint"; + return column.datatype==="date"||column.datatype==="timestamp"||column.datatype==="string"||column.datatype.startsWith("varchar")||column.datatype==="bigint"||column.datatype==="int"; }); return columns; }; @@ -71,12 +71,15 @@ KylinApp.controller('ModelEditCtrl', function ($scope, $q, $routeParams, $locati $scope.isBigInt=false; $scope.partitionChange = function (dateColumn) { + if(dateColumn==null) { + return; + } var column = _.filter($scope.getColumnsByTable($scope.modelsManager.selectedModel.fact_table),function(_column){ var columnName=$scope.modelsManager.selectedModel.fact_table+"."+_column.name; if(dateColumn==columnName) return _column; }); - if(column[0].datatype==="bigint"){ + if(column[0].datatype==="bigint"||column[0].datatype==="int"){ $scope.isBigInt=true; $scope.modelsManager.selectedModel.partition_desc.partition_date_format=null;; $scope.partitionColumn.hasSeparateTimeColumn=false; http://git-wip-us.apache.org/repos/asf/kylin/blob/413bc9f2/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 693241c..f0390e5 100644 --- a/webapp/app/partials/modelDesigner/conditions_settings.html +++ b/webapp/app/partials/modelDesigner/conditions_settings.html @@ -67,7 +67,7 @@ <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'" ng-disable="isBigInt(modelsManager.selectedModel.partition_desc.partition_date_column)" + ng-if="state.mode=='edit'" data-placement="" ng-options="ddt as ddt for ddt in cubeConfig.partitionDateFormatOpt"> <option value="">--Select Date Format--</option> @@ -164,7 +164,7 @@ <script type="text/ng-template" id="partitionTip.html"> <ol> <li>Partition date column not required,leave as default if cube always need full build</Li> - <li>Column should contain date value (type can be Date, Timestamp, String, VARCHAR,BigInt, etc.)</li> + <li>Column should contain date value (type can be Date, Timestamp, String, VARCHAR, Int, BigInt, etc.)</li> </ol> </script>
