KYLIN-2275,Remove dimensions cause wrong remove in advance settings Signed-off-by: zhongjian <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/076fbcfb Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/076fbcfb Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/076fbcfb Branch: refs/heads/KYLIN-2283 Commit: 076fbcfb616cee4b4696cae20178ad6dc8365b3c Parents: 36a42d8 Author: luguosheng <550175...@qq.com> Authored: Tue Dec 13 14:41:31 2016 +0800 Committer: Li Yang <liy...@apache.org> Committed: Thu Dec 15 18:57:36 2016 +0800 ---------------------------------------------------------------------- webapp/app/js/controllers/cubeEdit.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/076fbcfb/webapp/app/js/controllers/cubeEdit.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js index 85bd4b1..b901e48 100755 --- a/webapp/app/js/controllers/cubeEdit.js +++ b/webapp/app/js/controllers/cubeEdit.js @@ -662,14 +662,18 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio var mandatory = group.select_rule.mandatory_dims; if(mandatory && mandatory.length){ var columnIndex = mandatory.indexOf(deprecatedItem); - group.select_rule.mandatory_dims.splice(columnIndex,1); + if(columnIndex>=0){ + group.select_rule.mandatory_dims.splice(columnIndex,1); + } } var hierarchys = group.select_rule.hierarchy_dims; if(hierarchys && hierarchys.length){ for(var i=0;i<hierarchys.length;i++){ var hierarchysIndex = hierarchys[i].indexOf(deprecatedItem); - group.select_rule.hierarchy_dims[i].splice(hierarchysIndex,1); + if(hierarchysIndex>=0) { + group.select_rule.hierarchy_dims[i].splice(hierarchysIndex, 1); + } } } @@ -678,7 +682,9 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio if(joints && joints.length){ for(var i=0;i<joints.length;i++){ var jointIndex = joints[i].indexOf(deprecatedItem); - group.select_rule.joint_dims[i].splice(jointIndex,1); + if(jointIndex>=0) { + group.select_rule.joint_dims[i].splice(jointIndex, 1); + } } }