Skip to content

Commit

Permalink
Fix for dynamic dialog fields not being updated
Browse files Browse the repository at this point in the history
Using dialogField.value for fields that are not a subclass of
DialogFieldSortedItem.

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1696474
  • Loading branch information
romanblanco committed Apr 10, 2019
1 parent 851569e commit 633df92
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/dialog-user/components/dialog-user/dialogField.html
Expand Up @@ -13,15 +13,15 @@

<div ng-switch on="vm.dialogField.type">
<div class="col-sm-4" ng-switch-when="DialogFieldTextBox">
<input ng-model="vm.dialogField.default_value"
<input ng-model="vm.dialogField.values"
ng-disabled="vm.dialogField.read_only || vm.inputDisabled"
ng-change="vm.changesHappened()"
ng-blur="vm.validateField()"
ng-model-options="{debounce: {'default': 500}}"
class="form-control"
type="{{ vm.dialogField.options.protected ? 'password' : 'text' }}"
uib-tooltip="{{ ::inputTitle }}"
value="{{ vm.dialogField.default_value }}"
value="{{ vm.dialogField.values }}"
id="{{ vm.dialogField.name }}">
<div ng-if="vm.dialogField.fieldValidation===false">{{ vm.dialogField.errorMessage }}</div>
</div>
Expand Down
6 changes: 4 additions & 2 deletions src/dialog-user/components/dialog-user/dialogField.ts
Expand Up @@ -68,10 +68,12 @@ export class DialogFieldController extends DialogFieldClass {
public changesHappened(value) {
const selectedValue = 0;
this.validation = this.validateField();
let fieldValue = (value ? value[selectedValue] : this.dialogField.default_value);
let fieldValue = (value ? value[selectedValue] : this.dialogField.values);
if ((this.dialogField.type === 'DialogFieldTagControl' ||
this.dialogField.type === 'DialogFieldDropDownList') &&
this.dialogField.type === 'DialogFieldDropDownList' ||
this.dialogField.type === 'DialogFieldRadioButton') &&
this.dialogField.default_value instanceof Array) {
// using `default_value` if field.type is a subclass of DialogFieldSortedItem
fieldValue = this.dialogField.default_value.join();
}
this.onUpdate({ dialogFieldName: this.field.name, value: fieldValue });
Expand Down

0 comments on commit 633df92

Please sign in to comment.