From 8fdc018d6b0d4876cadfe0c1ae94f858c7e76351 Mon Sep 17 00:00:00 2001
From: "peng.jianhua" <peng.jianhua@zte.com.cn>
Date: Mon, 27 Nov 2017 17:21:21 +0800
Subject: [PATCH 1/1] KYLIN-3049 Filter the invalid zero value of 'Auto Merge
 Thresholds' parameter when you create or upate a cube.

---
 webapp/app/js/controllers/cubeEdit.js |  1 +
 webapp/app/js/utils/utils.js          | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js
index 5f78b61..99b298c 100755
--- a/webapp/app/js/controllers/cubeEdit.js
+++ b/webapp/app/js/controllers/cubeEdit.js
@@ -282,6 +282,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
       $scope.cubeMetaFrame.model_name = $scope.cubeMetaFrame.name;
     }
 
+    VdmUtil.removeElementInArrayByValue($scope.cubeMetaFrame.auto_merge_time_ranges, 0);
     $scope.state.project = ProjectModel.getSelectedProject();
 //        delete $scope.cubeMetaFrame.project;
 
diff --git a/webapp/app/js/utils/utils.js b/webapp/app/js/utils/utils.js
index 30ad261..9c92a02 100644
--- a/webapp/app/js/utils/utils.js
+++ b/webapp/app/js/utils/utils.js
@@ -169,6 +169,16 @@ KylinApp.factory('VdmUtil', function ($modal, $timeout, $location, $anchorScroll
     },
     isNotExtraKey:function(obj,key){
       return obj&&key&&key!="$promise"&&key!='$resolved'&&obj.hasOwnProperty(key);
+    },
+    removeElementInArrayByValue:function(arr,val){
+      if(!arr || arr.length === 0){
+        return;
+      }
+      for(var i=arr.length-1; i>=0; i--) {
+        if(arr[i] == val) {
+          arr.splice(i, 1);
+        }
+      }
     }
   }
 });
-- 
2.7.2.windows.1