fixed rendering of normal response data after form submit

removed console logs
frmlx · Apr 9, 2024 · 112135c · 112135c
1 parent 87af9ce
commit 112135c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/appdata/modules/Framelix/js/form/framelix-form.js b/appdata/modules/Framelix/js/form/framelix-form.js
@@ -673,7 +673,6 @@ class FramelixForm {
           if (!(buttonData.additionalAttributes instanceof FramelixHtmlAttributes)) {
             buttonData.additionalAttributes = FramelixObjectUtils.phpJsonToJs(buttonData.additionalAttributes)
           }
-          console.log(buttonData)
           buttonData.additionalAttributes.assignToElement(button)
         }
         button.attr('data-type', buttonData.type)
@@ -901,8 +900,9 @@ class FramelixForm {
       }
       FramelixToast.showNext()
     }
-
-    if (typeof responseData.buffer === 'string' && responseData.buffer.length) {
+    if (typeof responseData === 'string') {
+      FramelixRequest.renderResponse(responseData, requestOptions, this.container[0])
+    } else if (typeof responseData.buffer === 'string' && responseData.buffer.length) {
       FramelixRequest.renderResponse(responseData.buffer, requestOptions, this.container[0])
     }
     return true

diff --git a/appdata/modules/Framelix/js/framelix-request.js b/appdata/modules/Framelix/js/framelix-request.js
@@ -247,7 +247,6 @@ class FramelixRequest {
         }
       }
     }
-    console.log(requestOptions)
     const isFixedResponse = !(request instanceof FramelixRequest)
     if (!requestOptions.renderTarget || requestOptions.renderTarget === FramelixTypeDefJsRequestOptions.RENDER_TARGET_NONE_AND_CLOSE) {
       if (!isFixedResponse) {

diff --git a/appdata/modules/Framelix/public/dist/js/form.min.js b/appdata/modules/Framelix/public/dist/js/form.min.js
@@ -396,7 +396,6 @@ class FramelixForm {
           if (!(buttonData.additionalAttributes instanceof FramelixHtmlAttributes)) {
             buttonData.additionalAttributes = FramelixObjectUtils.phpJsonToJs(buttonData.additionalAttributes);
           }
-          console.log(buttonData);
           buttonData.additionalAttributes.assignToElement(button);
         }
         button.attr('data-type', buttonData.type);
@@ -606,7 +605,9 @@ class FramelixForm {
       }
       FramelixToast.showNext();
     }
-    if (typeof responseData.buffer === 'string' && responseData.buffer.length) {
+    if (typeof responseData === 'string') {
+      FramelixRequest.renderResponse(responseData, requestOptions, this.container[0]);
+    } else if (typeof responseData.buffer === 'string' && responseData.buffer.length) {
       FramelixRequest.renderResponse(responseData.buffer, requestOptions, this.container[0]);
     }
     return true;

diff --git a/appdata/modules/Framelix/public/dist/js/general.min.js b/appdata/modules/Framelix/public/dist/js/general.min.js
@@ -1673,7 +1673,6 @@ class FramelixRequest {
         }
       }
     }
-    console.log(requestOptions);
     const isFixedResponse = !(request instanceof FramelixRequest);
     if (!requestOptions.renderTarget || requestOptions.renderTarget === FramelixTypeDefJsRequestOptions.RENDER_TARGET_NONE_AND_CLOSE) {
       if (!isFixedResponse) {

diff --git a/appdata/modules/Framelix/src/Storable/User.php b/appdata/modules/Framelix/src/Storable/User.php
@@ -30,7 +30,8 @@ class User extends StorableExtended
     private static array $cache = [];
 
     /**
-     * Only used for unit tests to simulate specific roles without actually storing that in the database The check is cached by default, once it have been checked. Set true to flush the cache
+     * Only used for unit tests to simulate specific roles without actually storing that in the database The check is
+     * cached by default, once it have been checked. Set true to flush the cache
      * @var string[]|null
      */
     public ?array $simulateRoles = null;
@@ -217,4 +218,5 @@ public function delete(bool $force = false): void
         self::deleteMultiple(UserWebAuthn::getByCondition('`user` = {0}', [$this]));
         parent::delete($force);
     }
+
 }