From 26a76167085e58f69dc00d59acf65ca04bf0f2c5 Mon Sep 17 00:00:00 2001 From: jian Date: Fri, 4 Dec 2015 17:48:46 +0800 Subject: [PATCH] KYLIN-919 validate model dimensions rule update --- webapp/app/js/controllers/modelSchema.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/webapp/app/js/controllers/modelSchema.js b/webapp/app/js/controllers/modelSchema.js index 682ce5e..198b91a 100644 --- a/webapp/app/js/controllers/modelSchema.js +++ b/webapp/app/js/controllers/modelSchema.js @@ -206,11 +206,15 @@ KylinApp.controller('ModelSchemaCtrl', function ($scope, QueryService, UserServi if (!modelsManager.selectedModel.dimensions.length) { errors.push("No dimensions defined."); } + var isDimensionDefined = false; angular.forEach(modelsManager.selectedModel.dimensions, function (_dimension) { - if (!_dimension.columns || !_dimension.columns.length) { - errors.push("No dimension columns defined for Table[" + _dimension.table + "]"); + if(_dimension.columns && _dimension.columns.length){ + isDimensionDefined = true; } }); + if(!isDimensionDefined){ + errors.push("No dimensions defined."); + } var errorInfo = ""; angular.forEach(errors, function (item) { errorInfo += "\n" + item; -- 2.4.9 (Apple Git-60)