Disable the image upload when attachments are disabled

Fixes WoltLab/editor#27

diff --git a/com.woltlab.wcf/templates/wysiwyg.tpl b/com.woltlab.wcf/templates/wysiwyg.tpl
index c2a2982a5a11ba1dba8a4bf26777702832b7d0d1..4bc50101ca3bbf513c161cd7b615df5b83f79a4c 100644 (file)
--- a/com.woltlab.wcf/templates/wysiwyg.tpl
+++ b/com.woltlab.wcf/templates/wysiwyg.tpl
@@ -14,9 +14,14 @@
                        throw new Error("Unable to find the source element '{$wysiwygSelector|encodeJS}' for the editor.")
                }
 
+               let enableAttachments = element.dataset.disableAttachments !== "true";
+               {if !$attachmentHandler|empty && !$attachmentHandler->canUpload()}
+               enableAttachments = false;
+               {/if}
+
                const features = {
                        alignment: true,
-                       attachment: element.dataset.disableAttachments !== "true",
+                       attachment: enableAttachments,
                        autosave: element.dataset.autosave || "",
                        code: true,
                        codeBlock: true,

diff --git a/ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts b/ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts
index 8ce6e2ec9d051dd2fcd1dbc4f199f911f2b0ce6d..41c112dbe4fed2fb4248544eaa7593b1e212b946 100644 (file)
--- a/ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts
+++ b/ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts
@@ -118,6 +118,10 @@ class ConfigurationBuilder {
   #setupImage(): void {
     if (this.#features.image) {
       this.#toolbar.push("insertImage");
+
+      if (!this.#features.attachment) {
+        this.#removePlugins.push("ImageUpload", "ImageUploadUI", "WoltlabAttachment");
+      }
     } else {
       this.#removePlugins.push("ImageInsertUI", "ImageToolbar", "ImageStyle", "ImageUpload", "ImageUploadUI");
 

diff --git a/wcfsetup/install/files/acp/templates/wysiwyg.tpl b/wcfsetup/install/files/acp/templates/wysiwyg.tpl
index c2a2982a5a11ba1dba8a4bf26777702832b7d0d1..4bc50101ca3bbf513c161cd7b615df5b83f79a4c 100644 (file)
--- a/wcfsetup/install/files/acp/templates/wysiwyg.tpl
+++ b/wcfsetup/install/files/acp/templates/wysiwyg.tpl
@@ -14,9 +14,14 @@
                        throw new Error("Unable to find the source element '{$wysiwygSelector|encodeJS}' for the editor.")
                }
 
+               let enableAttachments = element.dataset.disableAttachments !== "true";
+               {if !$attachmentHandler|empty && !$attachmentHandler->canUpload()}
+               enableAttachments = false;
+               {/if}
+
                const features = {
                        alignment: true,
-                       attachment: element.dataset.disableAttachments !== "true",
+                       attachment: enableAttachments,
                        autosave: element.dataset.autosave || "",
                        code: true,
                        codeBlock: true,

diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Configuration.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Configuration.js
index 689eed95cac3b7c106c815a425e3f74ef573fd6f..6bf78ca6393d0ecd2628ca670073fac45b78badf 100644 (file)
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Configuration.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Configuration.js
@@ -107,6 +107,9 @@ define(["require", "exports", "../../Language"], function (require, exports, Lan
         #setupImage() {
             if (this.#features.image) {
                 this.#toolbar.push("insertImage");
+                if (!this.#features.attachment) {
+                    this.#removePlugins.push("ImageUpload", "ImageUploadUI", "WoltlabAttachment");
+                }
             }
             else {
                 this.#removePlugins.push("ImageInsertUI", "ImageToolbar", "ImageStyle", "ImageUpload", "ImageUploadUI");