From c418c2e1d57b6e8b4c7bbe3c6f976320819e00ae Mon Sep 17 00:00:00 2001
From: Vito Albano <valbano@MacPro.local>
Date: Fri, 25 Nov 2016 10:43:43 +0000
Subject: [PATCH] Fixed changes asked on PR - fixed unstable form

---
 .../components/widgets/display-value/display-value.widget.ts  | 1 +
 .../src/components/widgets/dropdown/dropdown.widget.html      | 2 +-
 .../src/components/widgets/dropdown/dropdown.widget.ts        | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

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 3827a63c67..7b56927957 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
@@ -54,6 +54,7 @@ export class DisplayValueWidget extends WidgetComponent implements OnInit, After
     ngOnInit() {
         if (this.field) {
             this.value = this.field.value;
+            this.visibilityService.refreshEntityVisibility(this.field);
             if (this.field.params) {
                 let originalField = this.field.params['field'];
                 if (originalField && originalField.type) {
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.html
index 5ca84824b9..b03d64ebde 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.html
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.html
@@ -5,7 +5,7 @@
             [attr.id]="field.id"
             [(ngModel)]="field.value"
             (ngModelChange)="checkVisibility(field)">
-        <option *ngFor="let opt of field.options" [value]="getOptionValue(opt)" [id]="opt.id">{{opt.name}}</option>
+        <option *ngFor="let opt of field.options" [value]="getOptionValue(opt, field.value)" [id]="opt.id">{{opt.name}}</option>
     </select>
     <span *ngIf="field.validationSummary" class="mdl-textfield__error">{{field.validationSummary}}</span>
 </div>
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.ts b/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.ts
index 46ef9d144a..f1c56639d0 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.ts
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.ts
@@ -82,9 +82,9 @@ export class DropdownWidget extends WidgetComponent implements OnInit {
             );
     }
 
-    getOptionValue(option: FormFieldOption): string {
+    getOptionValue(option: FormFieldOption, fieldValue: string): string {
         let optionValue: string = '';
-        if (option.id === 'empty' || option.name !== this.field.value) {
+        if (option.id === 'empty' || option.name !== fieldValue) {
             optionValue = option.id;
         } else {
             optionValue = option.name;