diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.ts b/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.ts index 7b56927957..cc739c2d7e 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.ts @@ -175,7 +175,6 @@ export class DisplayValueWidget extends WidgetComponent implements OnInit, After } else { this.value = this.field.value; } - this.visibilityService.refreshEntityVisibility(this.field); }, error => { console.log(error); @@ -197,7 +196,6 @@ export class DisplayValueWidget extends WidgetComponent implements OnInit, After } else { this.value = this.field.value; } - this.visibilityService.refreshEntityVisibility(this.field); }, error => { console.log(error); diff --git a/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.ts b/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.ts index 6a26683563..230856e9dc 100644 --- a/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.ts +++ b/ng2-components/ng2-activiti-form/src/services/widget-visibility.service.ts @@ -128,10 +128,12 @@ export class WidgetVisibilityService { let fieldFound = containerColumnModel.fields.find(field => this.isSearchedField(field, name)); if (fieldFound) { fieldValue = this.getObjectValue(fieldFound); - if (!fieldValue && fieldFound.value && fieldFound.value.id) { - fieldValue = fieldFound.value.id; - } else { - fieldValue = fieldFound.value; + if (!fieldValue) { + if (fieldFound.value && fieldFound.value.id) { + fieldValue = fieldFound.value.id; + } else { + fieldValue = fieldFound.value; + } } } }); @@ -156,7 +158,7 @@ export class WidgetVisibilityService { private isSearchedField(field: FormFieldModel, fieldToFind: string) { let forrmattedFieldName = this.removeLabel(field, fieldToFind); - return field.name === forrmattedFieldName; + return field.name.toUpperCase() === forrmattedFieldName.toUpperCase(); } private removeLabel(field: FormFieldModel, fieldToFind) {