kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From liy...@apache.org
Subject [50/52] [abbrv] kylin git commit: minor, enable close-on-select for ui-select, dropDown list will not close when user pick up one option
Date Sun, 21 Feb 2016 11:52:45 GMT
minor, enable close-on-select for ui-select, dropDown list will not close when user pick up
one option


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

Branch: refs/heads/1.x-HBase1.1.3
Commit: 0e5be051fed9d69ee2293130e07040558f258049
Parents: 0c120c3
Author: janzhongi <jiazhong@ebay.com>
Authored: Fri Feb 19 16:45:44 2016 +0800
Committer: janzhongi <jiazhong@ebay.com>
Committed: Fri Feb 19 16:45:44 2016 +0800

----------------------------------------------------------------------
 webapp/app/js/controllers/cubeSchema.js                 | 10 +++++++---
 webapp/app/partials/cubeDesigner/advanced_settings.html |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/0e5be051/webapp/app/js/controllers/cubeSchema.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeSchema.js b/webapp/app/js/controllers/cubeSchema.js
index bbcc1fb..ba64a1d 100755
--- a/webapp/app/js/controllers/cubeSchema.js
+++ b/webapp/app/js/controllers/cubeSchema.js
@@ -185,10 +185,14 @@ KylinApp.controller('CubeSchemaCtrl', function ($scope, QueryService,
UserServic
     $scope.cubeMetaFrame.rowkey.aggregation_groups.push([]);
   };
 
-  $scope.refreshAggregationGroup = function (list, index, aggregation_groups) {
-    if (aggregation_groups) {
-      list[index] = aggregation_groups;
+  $scope.refreshAggregationGroup = function (list, index, aggregation_group) {
+    if (aggregation_group) {
+      list[index].length = aggregation_group.length;
+      for(var i=0;i<aggregation_group.length;i++){
+        list[index][i] = aggregation_group[i];
+      }
     }
+
   };
 
   $scope.removeElement = function (arr, element) {

http://git-wip-us.apache.org/repos/asf/kylin/blob/0e5be051/webapp/app/partials/cubeDesigner/advanced_settings.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/advanced_settings.html b/webapp/app/partials/cubeDesigner/advanced_settings.html
index 91d804c..e55cdbf 100755
--- a/webapp/app/partials/cubeDesigner/advanced_settings.html
+++ b/webapp/app/partials/cubeDesigner/advanced_settings.html
@@ -139,6 +139,7 @@
                 <td class="col-xs-11">
                     <!-- Dimensions -->
                   <ui-select
+                    close-on-select="false"
                     autofocus="true"
                     on-select="refreshAggregationGroup(cubeMetaFrame.rowkey.aggregation_groups,
$index, aggregation_groups)"
                     on-remove="refreshAggregationGroup(cubeMetaFrame.rowkey.aggregation_groups,
$index, aggregation_groups)"


Mime
View raw message