Add raw option for html block in order to render the html output in

admin view. closes #1269

CHANGELOG.md

@@ -14,6 +14,7 @@ The changelog contains informations about bug fixes, new features or bc breaking
 - [#1268](https://github.com/luyadev/luya/issues/1268) Module block strict render ability in order to strict render the given action and controller paths instead of parse them trough the request component.
 - [#1227](https://github.com/luyadev/luya/issues/1227) Added preloadModels() method for the Menu Query in order to collect all models for the given request. This can strongly reduce the sql count when working with properties or models.
 - [#1266](https://github.com/luyadev/luya/issues/1266) render() method for the mailer component in order to provide controller template files.
+- [#1269](https://github.com/luyadev/luya/issues/1269) Add raw option for html block in order to render the html output in admin view.
 
 ### Fixed
 

modules/cms/composer.json

@@ -19,7 +19,8 @@
 	   "phpunit/phpunit" : "~5.0",
 	   "luyadev/luya" : "^1.0@dev",
 	   "luyadev/luya-module-admin" : "^1.0@dev",
-	   "satooshi/php-coveralls": "~1.0"
+	   "satooshi/php-coveralls": "~1.0",
+	   "twig/twig" : "^2.0"
 	},
 	"autoload" : {
 		"psr-4" : {

modules/cms/src/frontend/blocks/HtmlBlock.php

@@ -54,8 +54,11 @@ public function config()
     {
         return [
             'vars' => [
-                ['var' => 'html', 'label' => Module::t('block_html_html_label'), 'type' => 'zaa-textarea'],
+                ['var' => 'html', 'label' => Module::t('block_html_html_label'), 'type' => self::TYPE_TEXTAREA],
             ],
+        	'cfgs' => [
+        		['var' => 'raw', 'label' => Module::t('block_html_cfg_raw_label'), 'type' => self::TYPE_CHECKBOX]
+        	],
         ];
     }
 
@@ -64,6 +67,16 @@ public function config()
      */
     public function admin()
     {
-        return '{% if vars.html is empty %}<span class="block__empty-text">' . Module::t('block_html_no_content') . '</span>{% else %}<p><code>{{ vars.html | escape }}</code></p>{% endif %}';
+    	$message =  Module::t('block_html_no_content');
+    	return <<<EOT
+    	{% if vars.html is empty %}
+    		<span class="block__empty-text">{$message}</span>{% else %}
+    		{% if cfgs.raw == 1 %}
+    			{{ vars.html | raw }}
+    		{% else %}
+    			<pre><code>{{ vars.html | escape }}</code></pre>
+    		{% endif %}
+    	{% endif %}
+EOT;
     }
 }

modules/cms/src/frontend/messages/de/cms.php

@@ -179,6 +179,7 @@
 
     // 1.0.0
     'block_module_strictrender' => 'Strict Render',
-    'block_module_strictrender_help' => 'When strict render is enabled, the module will only run the provided route (module, controller, action, params) without listening to action and controller routes.'
+    'block_module_strictrender_help' => 'When strict render is enabled, the module will only run the provided route (module, controller, action, params) without listening to action and controller routes.',
+	'block_html_cfg_raw_label' => 'Render HTML in Admin',
 
 ];

modules/cms/src/frontend/messages/el/cms.php

@@ -178,6 +178,7 @@
 
     // 1.0.0
     'block_module_strictrender' => 'Strict Render',
-    'block_module_strictrender_help' => 'When strict render is enabled, the module will only run the provided route (module, controller, action, params) without listening to action and controller routes.'
+    'block_module_strictrender_help' => 'When strict render is enabled, the module will only run the provided route (module, controller, action, params) without listening to action and controller routes.',
+	'block_html_cfg_raw_label' => 'Render HTML in Admin',
 
 ];

modules/cms/src/frontend/messages/en/cms.php

@@ -179,5 +179,6 @@
 
     // 1.0.0
     'block_module_strictrender' => 'Strict Render',
-    'block_module_strictrender_help' => 'When strict render is enabled, the module will only run the provided route (module, controller, action, params) without listening to action and controller routes.'
+    'block_module_strictrender_help' => 'When strict render is enabled, the module will only run the provided route (module, controller, action, params) without listening to action and controller routes.',
+	'block_html_cfg_raw_label' => 'Render HTML in Admin',
 ];

modules/cms/src/frontend/messages/es/cms.php

@@ -179,6 +179,7 @@
 
     // 1.0.0
     'block_module_strictrender' => 'Strict Render',
-    'block_module_strictrender_help' => 'When strict render is enabled, the module will only run the provided route (module, controller, action, params) without listening to action and controller routes.'
+    'block_module_strictrender_help' => 'When strict render is enabled, the module will only run the provided route (module, controller, action, params) without listening to action and controller routes.',
+	'block_html_cfg_raw_label' => 'Render HTML in Admin',
 
 ];

modules/cms/src/frontend/messages/fr/cms.php

@@ -179,6 +179,7 @@
 
     // 1.0.0
     'block_module_strictrender' => 'Strict Render',
-    'block_module_strictrender_help' => 'When strict render is enabled, the module will only run the provided route (module, controller, action, params) without listening to action and controller routes.'
+    'block_module_strictrender_help' => 'When strict render is enabled, the module will only run the provided route (module, controller, action, params) without listening to action and controller routes.',
+	'block_html_cfg_raw_label' => 'Render HTML in Admin',
 
 ];

modules/cms/src/frontend/messages/it/cms.php

@@ -178,6 +178,6 @@
 
     // 1.0.0
     'block_module_strictrender' => 'Strict Render',
-    'block_module_strictrender_help' => 'When strict render is enabled, the module will only run the provided route (module, controller, action, params) without listening to action and controller routes.'
-    
+    'block_module_strictrender_help' => 'When strict render is enabled, the module will only run the provided route (module, controller, action, params) without listening to action and controller routes.',
+	'block_html_cfg_raw_label' => 'Render HTML in Admin',
 ];

modules/cms/src/frontend/messages/pt/cms.php

@@ -179,6 +179,7 @@
 
     // 1.0.0
     'block_module_strictrender' => 'Strict Render',
-    'block_module_strictrender_help' => 'When strict render is enabled, the module will only run the provided route (module, controller, action, params) without listening to action and controller routes.'
+    'block_module_strictrender_help' => 'When strict render is enabled, the module will only run the provided route (module, controller, action, params) without listening to action and controller routes.',
+	'block_html_cfg_raw_label' => 'Render HTML in Admin',
 
 ];

modules/cms/src/frontend/messages/ru/cms.php

@@ -179,6 +179,7 @@
 
     // 1.0.0
     'block_module_strictrender' => 'Strict Render',
-    'block_module_strictrender_help' => 'When strict render is enabled, the module will only run the provided route (module, controller, action, params) without listening to action and controller routes.'
+    'block_module_strictrender_help' => 'When strict render is enabled, the module will only run the provided route (module, controller, action, params) without listening to action and controller routes.',
+	'block_html_cfg_raw_label' => 'Render HTML in Admin',
 
 ];

modules/cms/src/frontend/messages/ua/cms.php

@@ -179,6 +179,7 @@
 
     // 1.0.0
     'block_module_strictrender' => 'Strict Render',
-    'block_module_strictrender_help' => 'When strict render is enabled, the module will only run the provided route (module, controller, action, params) without listening to action and controller routes.'
+    'block_module_strictrender_help' => 'When strict render is enabled, the module will only run the provided route (module, controller, action, params) without listening to action and controller routes.',
+	'block_html_cfg_raw_label' => 'Render HTML in Admin',
 
 ];

modules/cms/tests/BlockTestCase.php

@@ -2,6 +2,8 @@
 
 namespace cmstests;
 
+use Twig_Loader_String;
+
 class BlockTestCase extends CmsFrontendTestCase
 {
     public $blockClass = null;
@@ -30,6 +32,20 @@ public function renderFrontend()
         $this->assertNotNull($this->block->getFieldHelp());
         return $this->block->renderFrontend();
     }
+
+    public function renderAdmin()
+    {
+    	$twig = new \Twig_Environment(new \Twig_Loader_Filesystem());
+    	$temp = $twig->createTemplate($this->block->renderAdmin());
+    	return $temp->render(['cfgs' => $this->block->getCfgValues(), 'vars' => $this->block->getVarValues()]);
+    }
+
+    public function renderAdminNoSpace()
+    {
+    	$text = trim(preg_replace('/\s+/', ' ', $this->renderAdmin()));
+
+    	return str_replace(['> ', ' <'], ['>', '<'], $text);
+    }
 
     public function renderFrontendNoSpace()
     {

modules/cms/tests/src/frontend/blocks/HtmlBlockTest.php

@@ -21,4 +21,18 @@ public function testInputHtml()
 
         $this->assertSame('<div class="foo">Hello World</div>', $this->renderFrontendNoSpace());
     }
+
+    public function testAdminRawOutput()
+    {
+    	$this->block->setVarValues([
+    		'html' => '<p>hello</p>',
+    	]);
+
+    	$this->assertSame('<pre><code>&lt;p&gt;hello&lt;/p&gt;</code></pre>', $this->renderAdminNoSpace());
+
+    	$this->block->setCfgValues(['raw' => 1]);
+
+    	$this->assertSame('<p>hello</p>', $this->renderAdminNoSpace());
+
+    }
 }