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/08/10 08:42:36 UTC

incubator-kylin git commit: KYLIN-933, create model UI enhancement, move fact table column to left

Repository: incubator-kylin
Updated Branches:
  refs/heads/0.7-staging 60528119c -> ba2b8e930


KYLIN-933, create model UI enhancement, move fact table column to left


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

Branch: refs/heads/0.7-staging
Commit: ba2b8e930e2ac836f4ddbd20899ecfc4c1236023
Parents: 6052811
Author: jiazhong <ji...@ebay.com>
Authored: Mon Aug 10 14:41:00 2015 +0800
Committer: jiazhong <ji...@ebay.com>
Committed: Mon Aug 10 14:41:54 2015 +0800

----------------------------------------------------------------------
 webapp/app/partials/cubeDesigner/data_model.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/ba2b8e93/webapp/app/partials/cubeDesigner/data_model.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/data_model.html b/webapp/app/partials/cubeDesigner/data_model.html
index 4aeb1da..6aa9d40 100644
--- a/webapp/app/partials/cubeDesigner/data_model.html
+++ b/webapp/app/partials/cubeDesigner/data_model.html
@@ -135,17 +135,17 @@
                             <div class="col-xs-9">
                                 <div ng-repeat="joinIndex in [] | range: newLookup.join.primary_key.length">
                                     <div>
-                                        <select style="width: 45%" chosen data-placeholder="Lookup Table Column"
-                                                ng-model="newLookup.join.primary_key[$index]"
-                                                ng-options="columns.name as columns.name for columns in getColumnsByTable(newLookup.table)" >
-                                            <option value=""></option>
-                                        </select>
-                                        <b>=</b>
                                         <select style="width: 45%" chosen data-placeholder="Fact Table Column"
                                                 ng-model="newLookup.join.foreign_key[$index]"
                                                 ng-options="columns.name as columns.name for columns in getColumnsByTable(metaModel.model.fact_table)" >
                                             <option value=""></option>
                                         </select>
+                                        <b>=</b>
+                                        <select style="width: 45%" chosen data-placeholder="Lookup Table Column"
+                                                ng-model="newLookup.join.primary_key[$index]"
+                                                ng-options="columns.name as columns.name for columns in getColumnsByTable(newLookup.table)" >
+                                            <option value=""></option>
+                                        </select>
                                         <button class="pull-right btn btn-xs btn-danger" style="cursor: pointer" tooltip="Delete"
                                                 ng-click="removeJoin($index);">
                                             <i class="fa fa-trash-o pointer"></i>
@@ -181,7 +181,7 @@
                                 <div class="col-xs-12">
                                     <ol class="text-info">
                                         <li>Pick up lookup table at first</li>
-                                        <li>Specify join relationship between chosen lookup table and fact table</li>
+                                        <li>Specify join relationship between fact table and chosen lookup table </li>
                                         <li>Join Type have to be same as will be used in query</li>
                                     </ol>
                                 </div>