Repository: kylin Updated Branches: refs/heads/master d509542fc -> d25450760
KYLIN-2705 Should allow user to remove partition_date_column in web Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/d2545076 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/d2545076 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/d2545076 Branch: refs/heads/master Commit: d2545076062219971f19cb086b334f0a2440a70b Parents: d509542 Author: kangkaisen <kangkai...@live.com> Authored: Thu Jun 29 20:10:30 2017 +0800 Committer: kangkaisen <kangkai...@meituan.com> Committed: Fri Jul 7 17:03:42 2017 +0800 ---------------------------------------------------------------------- webapp/app/js/controllers/modelConditionsSettings.js | 9 +++++++++ webapp/app/partials/modelDesigner/conditions_settings.html | 1 + 2 files changed, 10 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/d2545076/webapp/app/js/controllers/modelConditionsSettings.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/modelConditionsSettings.js b/webapp/app/js/controllers/modelConditionsSettings.js index 004d5bc..82abe0b 100644 --- a/webapp/app/js/controllers/modelConditionsSettings.js +++ b/webapp/app/js/controllers/modelConditionsSettings.js @@ -83,6 +83,15 @@ KylinApp.controller('ModelConditionsSettingsCtrl', function ($scope, $modal,Meta $scope.partitionChange = function (dateColumn) { judgeFormatEditable(dateColumn); }; + + $scope.tableChange = function (table) { + if (table == null) { + $scope.modelsManager.selectedModel.partition_desc.partition_date_column=null; + $scope.isFormatEdit.editable = false; + return; + } + }; + $scope.partitionColumn ={ "hasSeparateTimeColumn" : false } http://git-wip-us.apache.org/repos/asf/kylin/blob/d2545076/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 6775bcb..cce5de2 100644 --- a/webapp/app/partials/modelDesigner/conditions_settings.html +++ b/webapp/app/partials/modelDesigner/conditions_settings.html @@ -29,6 +29,7 @@ <div class="col-xs-12 col-sm-6" ng-if="state.mode=='edit'"> <select style="width: 49%" chosen data-placeholder="e.g. DEFAULT.TEST_KYLIN_FACT.CAL_DT" ng-model="selectedTables.fact" + ng-change="tableChange(selectedTables.fact)" data-placement="" ng-options="alias as alias for alias in availableFactTables" > <option value="">--Select Partition Table--</option>
