tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-06-28 07:29:31 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.1-config-compatibility-fixes' of git://github.com/tractorcow/silverstripe-userforms into tractorcow-3.1-config-compatibility-fixes

Browse Source
This commit is contained in:
Sean Harvey 2013-04-10 11:57:56 +12:00
commit b800877d98
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/model/UserDefinedForm.php
View File

@ -9,17 +9,17 @@ class UserDefinedForm extends Page {
/**
* @var string
*/
static $description = 'Adds a customizable form.';
private static $description = 'Adds a customizable form.';
/**
* @var string Required Identifier
*/
static $required_identifier = null;
private static $required_identifier = null;
/**
* @var array Fields on the user defined form page.
*/
static $db = array(
private static $db = array(
"SubmitButtonText" => "Varchar",
"OnCompleteMessage" => "HTMLText",
"ShowClearButton" => "Boolean",
@ -31,7 +31,7 @@ class UserDefinedForm extends Page {
/**
* @var array Default values of variables when this page is created
*/
static $defaults = array(
private static $defaults = array(
'Content' => '$UserDefinedForm',
'DisableSaveSubmissions' => 0,
'OnCompleteMessage' => '<p>Thanks, we\'ve received your submission.</p>'
@ -40,7 +40,7 @@ class UserDefinedForm extends Page {
/**
* @var array
*/
static $has_many = array(
private static $has_many = array(
"Fields" => "EditableFormField",
"Submissions" => "SubmittedForm",
"EmailRecipients" => "UserDefinedForm_EmailRecipient"
@ -477,7 +477,7 @@ class UserDefinedForm_Controller extends Page_Controller {
if($editableField->Required) {
$field->addExtraClass('requiredField');
if($identifier = UserDefinedForm::$required_identifier) {
if($identifier = UserDefinedForm::config()->required_identifier) {
$title = $field->Title() ." <span class='required-identifier'>". $identifier . "</span>";
$field->setTitle($title);

2
tests/UserDefinedFormControllerTest.php
View File

@ -97,7 +97,7 @@ class UserDefinedFormControllerTest extends FunctionalTest {
$requiredForm = $this->objFromFixture('UserDefinedForm', 'validation-form');
$controller = new UserDefinedFormControllerTest_Controller($requiredForm);
UserDefinedForm::$required_identifier = "*";
UserDefinedForm::config()->required_identifier = "*";
$fields = $controller->getFormFields();