Incorrect handling of sync errors
authorAlexander Ebert <ebert@woltlab.com>
Sun, 28 Feb 2021 12:42:00 +0000 (13:42 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 28 Feb 2021 12:42:00 +0000 (13:42 +0100)
Fixes #3946

ts/WoltLabSuite/Core/Acp/Ui/Devtools/Project/Sync.ts
ts/WoltLabSuite/Core/Ajax/Request.ts
wcfsetup/install/files/js/WoltLabSuite/Core/Acp/Ui/Devtools/Project/Sync.js
wcfsetup/install/files/js/WoltLabSuite/Core/Ajax/Request.js

index ec7428845af3f4f5fe168dee011dfb2bd6bc5598..62fdbb7570fdd9385a0aad3d67c4b13f53a0b431 100644 (file)
@@ -225,7 +225,7 @@ class AcpUiDevtoolsProjectSync {
 
     this.buttonSyncAll!.classList.remove("disabled");
 
-    return false;
+    return true;
   }
 
   _ajaxSetup(): ReturnType<AjaxCallbackSetup> {
index 366393ebc04d4054f87d24e786d58f60faae3138..9a533ba1568e83ad30f92f3a71f80147252b0d4b 100644 (file)
@@ -303,7 +303,7 @@ class AjaxRequest {
     let details = "";
     let message: string;
 
-    if (data !== null) {
+    if (data !== null && Object.keys(data).length > 0) {
       if (data.returnValues && data.returnValues.description) {
         details += `<br><p>Description:</p><p>${data.returnValues.description}</p>`;
       }
index e98b833bf9aab0bf3f8b9437186b228e6e7c8140..a08f8613a857a7161f052e2411c95cf75006b8b7 100644 (file)
@@ -151,7 +151,7 @@ define(["require", "exports", "tslib", "../../../../Ajax", "../../../../Language
                 Dialog_1.default.open(this, Ajax.getRequestObject(this).getErrorHtml(data, xhr));
             });
             this.buttonSyncAll.classList.remove("disabled");
-            return false;
+            return true;
         }
         _ajaxSetup() {
             return {
index c3e5bcaa12914e9a81a2fe4ad32d24597f1786f3..c00e0b67228deb1e0f4283121625c112f33793a6 100644 (file)
@@ -253,7 +253,7 @@ define(["require", "exports", "tslib", "./Status", "../Core", "../Dom/Change/Lis
         getErrorHtml(data, xhr) {
             let details = "";
             let message;
-            if (data !== null) {
+            if (data !== null && Object.keys(data).length > 0) {
                 if (data.returnValues && data.returnValues.description) {
                     details += `<br><p>Description:</p><p>${data.returnValues.description}</p>`;
                 }