From 410aae86efd0aef9999f09a924bdc6bca62d71bd Mon Sep 17 00:00:00 2001 From: kangkaisen Date: Thu, 29 Jun 2017 20:10:30 +0800 Subject: [PATCH] KYLIN-2705 Should allow user to remove partition_date_column in web --- webapp/app/js/controllers/modelConditionsSettings.js | 9 +++++++++ webapp/app/partials/modelDesigner/conditions_settings.html | 1 + 2 files changed, 10 insertions(+) diff --git a/webapp/app/js/controllers/modelConditionsSettings.js b/webapp/app/js/controllers/modelConditionsSettings.js index 004d5bc40..82abe0bf3 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 } diff --git a/webapp/app/partials/modelDesigner/conditions_settings.html b/webapp/app/partials/modelDesigner/conditions_settings.html index 6775bcb14..cce5de2cf 100644 --- a/webapp/app/partials/modelDesigner/conditions_settings.html +++ b/webapp/app/partials/modelDesigner/conditions_settings.html @@ -29,6 +29,7 @@