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 2016/02/19 10:43:25 UTC
kylin git commit: minor, enable close-on-select for ui-select,
dropDown list will not close when user pick up one option
Repository: kylin
Updated Branches:
refs/heads/1.x-staging 0c120c34d -> 0e5be051f
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-staging
Commit: 0e5be051fed9d69ee2293130e07040558f258049
Parents: 0c120c3
Author: janzhongi <ji...@ebay.com>
Authored: Fri Feb 19 16:45:44 2016 +0800
Committer: janzhongi <ji...@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)"