You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by zh...@apache.org on 2015/12/04 11:05:00 UTC

kylin git commit: KYLIN-919 validate model dimensions rule update

Repository: kylin
Updated Branches:
  refs/heads/2.x-staging 935533aa6 -> b8ee69c7e


KYLIN-919 validate model dimensions rule update


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/b8ee69c7
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/b8ee69c7
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/b8ee69c7

Branch: refs/heads/2.x-staging
Commit: b8ee69c7e236c7c66ba02e99f59845f2df5a50bf
Parents: 935533a
Author: jian <ji...@163.com>
Authored: Fri Dec 4 17:48:46 2015 +0800
Committer: jian <ji...@apache.org>
Committed: Fri Dec 4 18:04:31 2015 +0800

----------------------------------------------------------------------
 webapp/app/js/controllers/modelSchema.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/b8ee69c7/webapp/app/js/controllers/modelSchema.js
----------------------------------------------------------------------
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;