Correction dans la détection du service de template.

soosyze · Oct 24, 2020 · 545fcfe · 545fcfe
1 parent c33182b
commit 545fcfe
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 32 deletions.
diff --git a/core/modules/FileManager/Services/HookApp.php b/core/modules/FileManager/Services/HookApp.php
@@ -16,15 +16,17 @@ public function __construct($core)
 
     public function hookResponseAfter($request, &$response)
     {
-        if ($response instanceof \SoosyzeCore\Template\Services\Templating) {
-            $vendor = $this->core->getPath('modules', 'modules/core', false);
-            $script = $response->getBlock('this')->getVar('scripts');
-            $script .= '<script src="' . $vendor . '/FileManager/Assets/script.js"></script>';
+        if (!($response instanceof \SoosyzeCore\Template\Services\Templating)) {
+            return;
+        }
 
-            $styles = $response->getBlock('this')->getVar('styles');
-            $styles .= '<link rel="stylesheet" href="' . $vendor . '/FileManager/Assets/style.css">' . PHP_EOL;
+        $vendor = $this->core->getPath('modules', 'modules/core', false);
+        $script = $response->getBlock('this')->getVar('scripts');
+        $script .= '<script src="' . $vendor . '/FileManager/Assets/script.js"></script>';
 
-            $response->view('this', [ 'scripts' => $script, 'styles' => $styles ]);
-        }
+        $styles = $response->getBlock('this')->getVar('styles');
+        $styles .= '<link rel="stylesheet" href="' . $vendor . '/FileManager/Assets/style.css">' . PHP_EOL;
+
+        $response->view('this', [ 'scripts' => $script, 'styles' => $styles ]);
     }
 }
diff --git a/core/modules/Menu/Services/HookApp.php b/core/modules/Menu/Services/HookApp.php
@@ -26,9 +26,11 @@ public function hookResponseAfter($request, &$response)
 
     public function hookMenuShowResponseAfter($request, &$response)
     {
-        if ($response instanceof \SoosyzeCore\Template\Services\Templating) {
-            $script = $response->getBlock('this')->getVar('scripts');
-            $script .= '<script>
+        if (!($response instanceof \SoosyzeCore\Template\Services\Templating)) {
+            return;
+        }
+        $script = $response->getBlock('this')->getVar('scripts');
+        $script .= '<script>
             $().ready(function () {
                 var nestedSortables = [].slice.call($(\'.nested-sortable\'));
 
@@ -62,9 +64,8 @@ function render(idMenu) {
             });
             </script>';
 
-            $response->view('this', [
-                'scripts' => $script
-            ]);
-        }
+        $response->view('this', [
+            'scripts' => $script
+        ]);
     }
 }
diff --git a/core/modules/Node/Services/HookApp.php b/core/modules/Node/Services/HookApp.php
@@ -16,12 +16,14 @@ public function __construct($core)
 
     public function hookResponseAfter($request, &$response)
     {
-        if ($response instanceof \SoosyzeCore\Template\Services\Templating) {
-            $vendor = $this->core->getPath('modules', 'modules/core', false) . '/Node/Assets/script.js';
-            $script = $response->getBlock('this')->getVar('scripts');
-            $script .= '<script src="' . $vendor . '"></script>';
-            $response->view('this', [ 'scripts' => $script ]);
+        if (!($response instanceof \SoosyzeCore\Template\Services\Templating)) {
+            return;
         }
+
+        $vendor = $this->core->getPath('modules', 'modules/core', false) . '/Node/Assets/script.js';
+        $script = $response->getBlock('this')->getVar('scripts');
+        $script .= '<script src="' . $vendor . '"></script>';
+        $response->view('this', [ 'scripts' => $script ]);
     }
 
     public function hookNodeShowResponseAfter($response, $node)
@@ -50,9 +52,12 @@ public function hookNodeShowResponseAfter($response, $node)
 
     public function hookNodeEditResponseAfter($request, &$response)
     {
-        if ($response instanceof \SoosyzeCore\Template\Services\Templating) {
-            $script = $response->getBlock('this')->getVar('scripts');
-            $script .= '<script>
+        if (!($response instanceof \SoosyzeCore\Template\Services\Templating)) {
+            return;
+        }
+
+        $script = $response->getBlock('this')->getVar('scripts');
+        $script .= '<script>
             $().ready(function () {
                 var nestedSortables = [].slice.call($(\'.nested-sortable\'));
 
@@ -85,9 +90,8 @@ function render(idMenu) {
             });
             </script>';
 
-            $response->view('this', [
-                'scripts' => $script
-            ]);
-        }
+        $response->view('this', [
+            'scripts' => $script
+        ]);
     }
 }
diff --git a/core/modules/Node/Services/HookMenu.php b/core/modules/Node/Services/HookMenu.php
@@ -195,6 +195,10 @@ public function hookUpdateValid($validator, $id)
 
     public function getForm($request, &$response)
     {
+        if (!($response instanceof \SoosyzeCore\Template\Services\Templating)) {
+            return;
+        }
+
         $script = $response->getBlock('this')->getVar('scripts');
         $script .= '<script>
                 function toggle (id) {

diff --git a/core/modules/Trumbowyg/Services/Trumbowyg.php b/core/modules/Trumbowyg/Services/Trumbowyg.php
@@ -17,6 +17,10 @@ public function __construct($core, $router)
 
     public function getEditor($request, &$response)
     {
+        if (!($response instanceof \SoosyzeCore\Template\Services\Templating)) {
+            return;
+        }
+
         $vendor = $this->core->getPath('modules', 'core/modules', false) . '/Trumbowyg/vendor/';
         $script = $response->getBlock('this')->getVar('scripts');
         $style  = $response->getBlock('this')->getVar('styles');

diff --git a/core/modules/User/Services/User.php b/core/modules/User/Services/User.php
@@ -407,11 +407,13 @@ public function hookResponseBefore(&$request, &$response)
 
     public function hookResponseAfter($request, &$response)
     {
-        if ($response instanceof \SoosyzeCore\Template\Services\Templating) {
-            $vendor = $this->core->getPath('modules', 'modules/core', false) . '/User/Assets/js/script.js';
-            $script = $response->getBlock('this')->getVar('scripts');
-            $script .= '<script src="' . $vendor . '"></script>';
-            $response->view('this', [ 'scripts' => $script ]);
+        if (!($response instanceof \SoosyzeCore\Template\Services\Templating)) {
+            return;
         }
+
+        $vendor = $this->core->getPath('modules', 'modules/core', false) . '/User/Assets/js/script.js';
+        $script = $response->getBlock('this')->getVar('scripts');
+        $script .= '<script src="' . $vendor . '"></script>';
+        $response->view('this', [ 'scripts' => $script ]);
     }
 }