Skip to content
This repository was archived by the owner on Aug 7, 2020. It is now read-only.

hotfix(oui-criteria-adder) #231

Merged
merged 2 commits into from
Jul 17, 2018
Merged

hotfix(oui-criteria-adder) #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a48a6a4
fix(oui-criteria-adder): fix dropdown
frenautvh Jul 17, 2018
dfc9843
fix(oui-criteria-adder): minor code review changes
frenautvh Jul 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/oui-criteria-adder/src/criteria-adder.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ export default class {

this.selectableOperators = this.filterSelectableOperators();
this.operatorModel = this.selectableOperators[0];

this.resetValueModel();
}

$postLink () {
Expand Down
4 changes: 4 additions & 0 deletions packages/oui-criteria-adder/src/criteria-adder.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
ng-attr-id="{{::$ctrl.id}}Column"
name="{{::$ctrl.name}}Column"
model="$ctrl.columnModel"
ng-click="$event.stopPropagation()"
items="$ctrl.properties"
match="title"
on-change="$ctrl.onColumnChange()">
Expand All @@ -29,6 +30,7 @@
ng-attr-id="{{::$ctrl.id}}Operator"
name="{{::$ctrl.name}}Operator"
model="$ctrl.operatorModel"
ng-click="$event.stopPropagation()"
items="$ctrl.selectableOperators"
match="title">
<span ng-bind="$item.title"></span>
Expand Down Expand Up @@ -65,6 +67,7 @@
<oui-select
name="{{::$ctrl.name}}Value"
model="$ctrl.valueModel['boolean']"
ng-click="$event.stopPropagation()"
items="$ctrl.booleanChoices"
match="name"
data-align="start">
Expand All @@ -80,6 +83,7 @@
<oui-select
name="{{::$ctrl.name}}Value"
model="$ctrl.valueModel['options']"
ng-click="$event.stopPropagation()"
items="$ctrl.optionsChoices"
match="name"
data-align="start">
Expand Down