From 47b467c786f618efbb0f5f21fa44e8d461321699 Mon Sep 17 00:00:00 2001
From: Derek Begnoche <begnoche@civicplus.com>
Date: Wed, 29 Nov 2017 14:14:17 +0000
Subject: [PATCH] Display Default Values in UI

---
 .../content/content-field.component.html      |  3 ++-
 .../pages/content/content-page.component.ts   | 20 ++++++++++++++++---
 .../app/shared/services/schemas.service.ts    |  6 +++++-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/Squidex/app/features/content/pages/content/content-field.component.html b/src/Squidex/app/features/content/pages/content/content-field.component.html
index b8adf3f69..802caaafd 100644
--- a/src/Squidex/app/features/content/pages/content/content-field.component.html
+++ b/src/Squidex/app/features/content/pages/content/content-field.component.html
@@ -31,7 +31,7 @@
                             </div>
                             <div *ngSwitchCase="'Dropdown'">
                                 <select class="form-control" [formControlName]="partition">
-                                    <option></option>
+                                    <option [ngValue]="null"></option>
                                     <option *ngFor="let value of field.properties.allowedValues" [ngValue]="value">{{value}}</option>
                                 </select>
                             </div>
@@ -60,6 +60,7 @@
                             </div>
                             <div *ngSwitchCase="'Dropdown'">
                                 <select class="form-control" [formControlName]="partition">
+                                    <option [ngValue]="null"></option>
                                     <option *ngFor="let value of field.properties.allowedValues" [ngValue]="value">{{value}}</option>
                                 </select>
                             </div>
diff --git a/src/Squidex/app/features/content/pages/content/content-page.component.ts b/src/Squidex/app/features/content/pages/content/content-page.component.ts
index d5fb781a9..2b4cf62a0 100644
--- a/src/Squidex/app/features/content/pages/content/content-page.component.ts
+++ b/src/Squidex/app/features/content/pages/content/content-page.component.ts
@@ -256,11 +256,25 @@ export class ContentPageComponent implements CanComponentDeactivate, OnDestroy,
                     fieldForm.controls['iv'].setValue(fieldValue['iv'] === undefined ? null : fieldValue['iv']);
                 }
             }
-
             if (this.content.status === 'Archived') {
                 this.contentForm.disable();
             }
+        } else {
+            for (const field of this.schema.fields) {
+                if (field.properties.hasOwnProperty('defaultValue')) {
+                    const defaultValue = (field.properties as any).defaultValue;
+                    if (defaultValue) {
+                        const fieldForm = <FormGroup>this.contentForm.get(field.name);
+                        if (field.partitioning === 'language') {
+                            for (let language of this.languages) {
+                                fieldForm.controls[language.iso2Code].setValue(defaultValue);
+                            }
+                        } else {
+                            fieldForm.controls['iv'].setValue(defaultValue);
+                        }
+                    }
+                }
+            }
         }
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/Squidex/app/shared/services/schemas.service.ts b/src/Squidex/app/shared/services/schemas.service.ts
index 730dccd5f..13cc9597a 100644
--- a/src/Squidex/app/shared/services/schemas.service.ts
+++ b/src/Squidex/app/shared/services/schemas.service.ts
@@ -426,7 +426,11 @@ export class NumberFieldPropertiesDto extends FieldPropertiesDto {
         }
 
         if (this.allowedValues && this.allowedValues.length > 0) {
-            validators.push(ValidatorsEx.validValues(this.allowedValues));
+            if (this.isRequired && !isOptional) {
+                validators.push(ValidatorsEx.validValues(this.allowedValues));
+            } else {
+                validators.push(ValidatorsEx.validValues(this.allowedValues.concat([null])));
+            }
         }
 
         return validators;