You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ch...@apache.org on 2018/01/25 09:19:45 UTC
[1/2] kylin git commit: #3193 Prevent users cloning models across
projects
Repository: kylin
Updated Branches:
refs/heads/master d7aab19d3 -> b66f3da5c
#3193 Prevent users cloning models across projects
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/b66f3da5
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/b66f3da5
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/b66f3da5
Branch: refs/heads/master
Commit: b66f3da5ca24522dbb39cf4bae368d63bc2ff2e9
Parents: c49e263
Author: chenzhx <ch...@apache.org>
Authored: Thu Jan 25 17:18:59 2018 +0800
Committer: chenzhx <ch...@apache.org>
Committed: Thu Jan 25 17:19:26 2018 +0800
----------------------------------------------------------------------
webapp/app/partials/models/model_clone.html | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/b66f3da5/webapp/app/partials/models/model_clone.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/models/model_clone.html b/webapp/app/partials/models/model_clone.html
index 2554633..90df73d 100644
--- a/webapp/app/partials/models/model_clone.html
+++ b/webapp/app/partials/models/model_clone.html
@@ -29,14 +29,7 @@
<div class="form-group">
<b>Target Project is:</b>
<br/>
- <select ng-required="projectModel.projects.length" chosen ng-model="targetObj.targetProject"
- ng-init="newAccess.permission=permissions.READ.value;"
- ng-options="project.name as project.name for project in projectModel.projects "
- style="width: 100% !important;"
- data-placeholder="select a project"
- class="chosen-select">
- <option value=""></option>
- </select>
+ {{targetObj.targetProject}}
</div>
</div>
</div>
[2/2] kylin git commit: MTHDP-3537 Measure support fuzzy search
Posted by ch...@apache.org.
MTHDP-3537 Measure support fuzzy search
Signed-off-by: chenzhx <ch...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/c49e2639
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/c49e2639
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/c49e2639
Branch: refs/heads/master
Commit: c49e26393cbde59110f217939cf3165bb3984a53
Parents: d7aab19
Author: kangkaisen <ka...@meituan.com>
Authored: Thu Nov 30 19:09:14 2017 +0800
Committer: chenzhx <ch...@apache.org>
Committed: Thu Jan 25 17:19:26 2018 +0800
----------------------------------------------------------------------
webapp/app/partials/cubeDesigner/measures.html | 22 +++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/c49e2639/webapp/app/partials/cubeDesigner/measures.html
----------------------------------------------------------------------
diff --git a/webapp/app/partials/cubeDesigner/measures.html b/webapp/app/partials/cubeDesigner/measures.html
index 12d1af3..848831c 100755
--- a/webapp/app/partials/cubeDesigner/measures.html
+++ b/webapp/app/partials/cubeDesigner/measures.html
@@ -149,14 +149,20 @@
ng-init="newMeasure.function.parameter.value = 1">
<b> 1</b>
</span>
- <!--!COUNT_DISTINCT-->
- <select class="form-control" chosen
- ng-if="newMeasure.function.parameter.type == 'column'"
- ng-model="newMeasure.function.parameter.value" required
- ng-change="measureReturnTypeUpdate();"
- ng-options="column as column for column in measureParamValueColumn" >
- <option value="">{{dataKylin.cube.cubeMSParamValueSelect}}</option>
- </select>
+
+
+ <ui-select
+ ng-if="newMeasure.function.parameter.type == 'column'"
+ on-select="measureReturnTypeUpdate()"
+ on-remove="measureReturnTypeUpdate()"
+ ng-model="newMeasure.function.parameter.value"
+ >
+ <ui-select-match placeholder="Select Measure" style="overflow: auto;">{{$select.selected}}</ui-select-match>
+ <ui-select-choices repeat="column in measureParamValueColumn | filter:$select.search" style="word-break:break-all;">
+ <span ng-bind-html="column | highlight: $select.search"></span>
+ </ui-select-choices>
+ </ui-select>
+
</div>
<label ng-if="newMeasure.function.parameter.type == 'column'&& newMeasure.function.expression !== 'EXTENDED_COLUMN'">
<input type="checkbox" ng-model="newMeasure.showDim" ng-change="measureParamValueUpdate();" /> Also Show Dimensions