SHIBUI-706 Implemented fix for disabling type in provider editor

TIER · Aug 8, 2018 · a1fe98b · a1fe98b
1 parent fed1e48
commit a1fe98b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/ui/src/app/schema-form/widget/select/select.component.html b/ui/src/app/schema-form/widget/select/select.component.html
@@ -18,7 +18,6 @@
     <select *ngIf="schema.type !== 'array'"
         [formControl]="control"
         [attr.name]="name"
-        [attr.disabled]="schema.readOnly"
         class="form-control">
         <option disabled selected>{{ schema.placeholder || schema.title }}</option>
         <option *ngFor="let option of schema.oneOf" [ngValue]="option.enum[0]">{{option.description}}</option>

diff --git a/ui/src/app/schema-form/widget/select/select.component.ts b/ui/src/app/schema-form/widget/select/select.component.ts
@@ -16,7 +16,7 @@ export class CustomSelectComponent extends SelectWidget implements AfterViewInit
 
     ngAfterViewInit(): void {
         super.ngAfterViewInit();
-        if (this.schema.readOnly) {
+        if (this.schema.readOnly || this.schema.widget.disabled) {
             this.control.disable();
         } else {
             this.control.enable();

diff --git a/ui/src/assets/schema/provider/filebacked-http-common.editor.schema.json b/ui/src/assets/schema/provider/filebacked-http-common.editor.schema.json
@@ -83,7 +83,8 @@
             "type": "string",
             "readOnly": true,
             "widget": {
-                "id": "select"
+                "id": "select",
+                "disabled": true
             },
             "oneOf": [
                 {