Fix admin edition disabling feature

3 files changed, 18 insertions, 5 deletions

diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
index 6ae7b1b79..8fef39b79 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
@@ -1,4 +1,9 @@
 <h1 class="sr-only" i18n>Configuration</h1>
+
+<div class="alert alert-warning" *ngIf="!isUpdateAllowed()" i18n>
+  Updating instance configuration from the web interface is disabled by the system administrator.
+</div>
+
 <form role="form" [formGroup]="form">
 
   <div ngbNav #nav="ngbNav" [activeId]="activeNav" (activeIdChange)="onNavChange($event)" class="nav-tabs">
@@ -63,7 +68,7 @@
     <div class="col-md-7 col-xl-5"></div>
     <div class="col-md-5 col-xl-5">
 
-      <div class="form-error submit-error" i18n *ngIf="!form.valid && serverConfig.allowEdits">
+      <div class="form-error submit-error" i18n *ngIf="!form.valid && isUpdateAllowed()">
         There are errors in the form:
 
         <ul>
@@ -77,11 +82,14 @@
         You cannot allow live replay if you don't enable transcoding.
       </span>
 
-      <span i18n *ngIf="!serverConfig.allowEdits">
+      <span i18n *ngIf="!isUpdateAllowed()">
         You cannot change the server configuration because it's managed externally.
       </span>
 
-      <input (click)="formValidated()" type="submit" i18n-value value="Update configuration" [disabled]="!form.valid || !hasConsistentOptions() || !serverConfig.allowEdits">
+      <input
+        (click)="formValidated()" type="submit" i18n-value value="Update configuration"
+        [disabled]="!form.valid || !hasConsistentOptions() || !isUpdateAllowed()"
+      >
     </div>
   </div>
 </form>
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
index 04b0175a7..96c67fac7 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
@@ -258,7 +258,8 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
 
     this.loadConfigAndUpdateForm()
     this.loadCategoriesAndLanguages()
-    if (!this.serverConfig.allowEdits) {
+
+    if (!this.isUpdateAllowed()) {
       this.form.disable()
     }
   }
@@ -293,6 +294,10 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
       })
   }
 
+  isUpdateAllowed () {
+    return this.serverConfig.webadmin.configuration.edition.allowed === true
+  }
+
   hasConsistentOptions () {
     if (this.hasLiveAllowReplayConsistentOptions()) return true
 
diff --git a/client/src/app/shared/shared-forms/markdown-textarea.component.html b/client/src/app/shared/shared-forms/markdown-textarea.component.html
index a460cb9b7..7c2a42791 100644
--- a/client/src/app/shared/shared-forms/markdown-textarea.component.html
+++ b/client/src/app/shared/shared-forms/markdown-textarea.component.html
@@ -2,7 +2,7 @@
   <textarea #textarea
     [(ngModel)]="content" (ngModelChange)="onModelChange()"
     class="form-control" [ngClass]="classes"
-    [attr.disabled]="disabled"
+    [attr.disabled]="disabled || null"
     [ngStyle]="{ height: textareaHeight }"
     [id]="name" [name]="name">
   </textarea>