Repository: kylin Updated Branches: refs/heads/master eb92f96fc -> f12a5e77e
KYLIN-1926 check pk,fk type when edit model join relation Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/f12a5e77 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/f12a5e77 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/f12a5e77 Branch: refs/heads/master Commit: f12a5e77e81d88a89aa700dd2dccba7f2e0814ae Parents: 4ede67e Author: Jason <jiat...@163.com> Authored: Wed Sep 7 11:39:08 2016 +0800 Committer: Jason <jiat...@163.com> Committed: Wed Sep 7 11:39:28 2016 +0800 ---------------------------------------------------------------------- webapp/app/partials/modelDesigner/data_model.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/f12a5e77/webapp/app/partials/modelDesigner/data_model.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/modelDesigner/data_model.html b/webapp/app/partials/modelDesigner/data_model.html index 662d0d9..ace977f 100644 --- a/webapp/app/partials/modelDesigner/data_model.html +++ b/webapp/app/partials/modelDesigner/data_model.html @@ -173,7 +173,7 @@ </button> </div> <div class="space-4"></div> - <small class="help-block red" ng-show="newLookup.join.isCompatible[$index]==false"><i class="fa fa-exclamation-triangle"></i> <b>Column Type incompatible {{newLookup.join.primary_key[$index]}} [{{newLookup.join.pk_type[$index]}}],{{newLookup.join.foreign_key[$index]}}[{{newLookup.join.fk_type[$index]}}].</b></small> + <small class="help-block red" ng-show="newLookup.join.isCompatible[$index]==false"><i class="fa fa-exclamation-triangle"></i> <b>Column Type incompatible {{newLookup.join.foreign_key[$index]}}[{{newLookup.join.fk_type[$index]}}], {{newLookup.join.primary_key[$index]}} [{{newLookup.join.pk_type[$index]}}]</b></small> </div> </div> </div>