From 6b752e84a08c93c65579e3a0e0e753c19aebc42b Mon Sep 17 00:00:00 2001
From: chenzhx <346839943@qq.com>
Date: Wed, 7 Sep 2016 13:48:21 +0800
Subject: [PATCH] KYLIN-1698-INT

---
 webapp/app/js/controllers/modelEdit.js                     | 7 +++++--
 webapp/app/partials/modelDesigner/conditions_settings.html | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

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;
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>
 
-- 
2.7.2.windows.1