fix select bug KYLIN-519
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/2afafb21 Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/2afafb21 Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/2afafb21 Branch: refs/heads/inverted-index Commit: 2afafb21598f2535756f1dcf56b74ac73f5b7b9c Parents: 285bd56 Author: jiazhong <jiazh...@ebay.com> Authored: Wed Feb 11 19:53:55 2015 +0800 Committer: jiazhong <jiazh...@ebay.com> Committed: Wed Feb 11 19:53:55 2015 +0800 ---------------------------------------------------------------------- webapp/app/partials/common/access.html | 8 ++++++-- webapp/app/partials/cubeDesigner/advanced_settings.html | 3 +++ webapp/app/partials/cubeDesigner/data_model.html | 1 + webapp/app/partials/cubeDesigner/dimensions.html | 3 +++ webapp/app/partials/cubeDesigner/incremental.html | 1 + webapp/app/partials/cubeDesigner/measures.html | 2 ++ 6 files changed, 16 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/2afafb21/webapp/app/partials/common/access.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/common/access.html b/webapp/app/partials/common/access.html index d3ef769..74f8c9f 100644 --- a/webapp/app/partials/common/access.html +++ b/webapp/app/partials/common/access.html @@ -43,12 +43,16 @@ <input ng-model="newAccess.sid" ng-if="newAccess.principal==true" placeholder=" User NT Account..." style="width: 80%" /> <select chosen ng-model="newAccess.sid" ng-if="newAccess.principal==false" style="width: 80%" - ng-options="authority as authority for authority in authorities"></select> + ng-options="authority as authority for authority in authorities"> + <option value=""></option> + </select> </td> <td > <label><b>Permission </b> </label> <select ng-model="newAccess.permission" ng-init="newAccess.permission=permissions.READ.value" - ng-options="permission.value as permission.name for (name, permission) in permissions"></select> + ng-options="permission.value as permission.name for (name, permission) in permissions"> + <option value=""></option> + </select> </td> <td> <button class="btn btn-default btn-xs" ng-click="grant(type, entity, newAccess)" http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/2afafb21/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 53aac03..5c65886 100644 --- a/webapp/app/partials/cubeDesigner/advanced_settings.html +++ b/webapp/app/partials/cubeDesigner/advanced_settings.html @@ -33,6 +33,7 @@ <select class="form-control" ng-if="state.mode=='edit'" style="width: 360px;" chosen ng-model="metaModel.model.capacity" required ng-options="cc as cc for cc in cubeConfig.cubeCapacities"> + <option value=""></option> </select> <span ng-if="state.mode=='view'">{{metaModel.model.capacity}}</span> </div> @@ -65,6 +66,7 @@ ng-model="aggregation_groups" required chosen multiple ng-change="refreshAggregationGroup(cubeMetaFrame.rowkey.aggregation_groups, $index, aggregation_groups)" ng-options="rowkey_column.column as rowkey_column.column for rowkey_column in cubeMetaFrame.rowkey.rowkey_columns"> + <option value=""></option> </select> <p ng-if="state.mode=='view'" style="word-wrap: break-word; word-break: normal;max-width: 1000px ">{{aggregation_groups}}</p> </td> @@ -126,6 +128,7 @@ <select ng-if="state.mode=='edit'" style="width:80px;" chosen ng-model="rowkey_column.dictionary" ng-options="dt as dt for dt in cubeConfig.dictionaries"> + <option value=""></option> </select> <span ng-if="state.mode=='view'">{{rowkey_column.dictionary}}</span> </div> http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/2afafb21/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 aa221b6..bdfda69 100644 --- a/webapp/app/partials/cubeDesigner/data_model.html +++ b/webapp/app/partials/cubeDesigner/data_model.html @@ -125,6 +125,7 @@ <div class="col-sm-6"> <select class="form-control" chosen ng-model="newLookup.join.type" ng-options="joinType.value as joinType.name for joinType in cubeConfig.joinTypes"> + <option value=""></option> </select> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/2afafb21/webapp/app/partials/cubeDesigner/dimensions.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/cubeDesigner/dimensions.html b/webapp/app/partials/cubeDesigner/dimensions.html index f182e11..21ef2f5 100644 --- a/webapp/app/partials/cubeDesigner/dimensions.html +++ b/webapp/app/partials/cubeDesigner/dimensions.html @@ -161,11 +161,13 @@ <div class="col-xs-12 col-sm-6" ng-if="dimType.indexOf('derived') >= 0"> <select class="form-control" required="true" chosen data-placeholder="Select a lookup table" ng-model="newDimension.table" ng-options="table for table in availableTables.slice(1)"> + <option value=""></option> </select> </div> <div class="col-xs-12 col-sm-6" ng-if="dimType.indexOf('derived') == -1"> <select class="form-control" required="true" chosen data-placeholder="Select a table" ng-model="newDimension.table" ng-options="table for table in availableTables"> + <option value=""></option> </select> </div> <div class="col-xs-12 col-sm-3"> @@ -183,6 +185,7 @@ <div class="col-xs-12 col-sm-6"> <select class="form-control" required="true" chosen data-placeholder="Select a column" ng-model="newDimension.column[0]" ng-options="column.name as column.name for column in getColumnsByTable(newDimension.table)"> + <option value=""></option> </select> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/2afafb21/webapp/app/partials/cubeDesigner/incremental.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/cubeDesigner/incremental.html b/webapp/app/partials/cubeDesigner/incremental.html index c8dd927..b3a6b1e 100644 --- a/webapp/app/partials/cubeDesigner/incremental.html +++ b/webapp/app/partials/cubeDesigner/incremental.html @@ -29,6 +29,7 @@ ng-if="state.mode=='edit'" chosen ng-model="metaModel.model.partition_desc.partition_type" ng-options="ddt as ddt for ddt in cubeConfig.cubePartitionTypes"> + <option value=""></option> </select> <span ng-if="state.mode=='view'">{{metaModel.model.partition_desc.partition_type}}</span> </div> http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/2afafb21/webapp/app/partials/cubeDesigner/measures.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/cubeDesigner/measures.html b/webapp/app/partials/cubeDesigner/measures.html index 7599d51..7e19167 100644 --- a/webapp/app/partials/cubeDesigner/measures.html +++ b/webapp/app/partials/cubeDesigner/measures.html @@ -112,6 +112,7 @@ <select class="form-control" ng-init="newMeasure.function.expression = (!!newMeasure.function.expression)?newMeasure.function.expression:cubeConfig.dftSelections.measureExpression" chosen ng-model="newMeasure.function.expression" required ng-options="me as me for me in cubeConfig.measureExpressions"> + <option value=""></option> </select> </div> </div> @@ -125,6 +126,7 @@ ng-init="newMeasure.function.parameter.type=(!!newMeasure.function.parameter.type)?newMeasure.function.parameter.type: 'column' " chosen ng-model="newMeasure.function.parameter.type" required ng-options="mpt as mpt for mpt in cubeConfig.measureParamType"> + <option value=""></option> </select> <span class="font-color-default" ng-if="newMeasure.function.expression == 'COUNT'"
