tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-10-22 17:05:42 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #793 from stephenmcm/feat-disableShortcode

Browse Source 
Optional disable $UserDefinedForm
This commit is contained in:
Daniel Hensby 2018-07-11 22:54:58 +01:00 committed by GitHub
commit dc226cf8ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
_config/config.yml Normal file
View File

@ -0,0 +1,5 @@
---
Name: userformsconfig
---
SilverStripe\UserForms\Control\UserDefinedFormController:
disable_form_content_shortcode: false

3
code/Control/UserDefinedFormController.php
View File

@ -108,7 +108,8 @@ class UserDefinedFormController extends PageController
*/ */
public function index(HTTPRequest $request = null) public function index(HTTPRequest $request = null)
{ {
if ($this->Content && $form = $this->Form()) { $form = $this->Form();
if ($this->Content && $form && !$this->config()->disable_form_content_shortcode) {
$hasLocation = stristr($this->Content, '$UserDefinedForm'); $hasLocation = stristr($this->Content, '$UserDefinedForm');
if ($hasLocation) { if ($hasLocation) {
/** @see Requirements_Backend::escapeReplacement */ /** @see Requirements_Backend::escapeReplacement */

22
tests/Control/UserDefinedFormControllerTest.php
View File

@ -257,7 +257,7 @@ class UserDefinedFormControllerTest extends FunctionalTest
$controller = new UserDefinedFormController($form); $controller = new UserDefinedFormController($form);
// check to see if $Form is replaced to inside the content // check to see if $Form is placed in the template
$index = new ArrayData($controller->index()); $index = new ArrayData($controller->index());
$parser = new CSSContentParser($index->renderWith(__CLASS__)); $parser = new CSSContentParser($index->renderWith(__CLASS__));
@ -276,6 +276,26 @@ class UserDefinedFormControllerTest extends FunctionalTest
$this->checkTemplateIsCorrect($parser, $form); $this->checkTemplateIsCorrect($parser, $form);
} }
public function testRenderingIntoTemplateWithDisabledInterpolation()
{
$form = $this->setupFormFrontend();
$controller = new UserDefinedFormController($form);
$controller->config()->set('disable_form_content_shortcode', true);
// check to see if $Form is replaced to inside the content
$index = new ArrayData($controller->index());
$html = $index->renderWith(__CLASS__);
$parser = new CSSContentParser($html);
// Assert Content has been rendered with the shortcode in place
$this->assertContains('<p>Here is my form</p><p>$UserDefinedForm</p><p>Thank you for filling it out</p>', $html);
// And the form in the $From area
$this->assertArrayHasKey(0, $parser->getBySelector('form#UserForm_Form_' . $form->ID));
// check for the input
$this->assertArrayHasKey(0, $parser->getBySelector('input.text'));
}
/** /**
* Publish a form for use on the frontend * Publish a form for use on the frontend
* *