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

Merge pull request #107 from oddnoc/fix-statics

Browse Source 
BUG: Fix access to static configuration variables
This commit is contained in:
Will Rossiter 2013-04-03 23:35:13 -07:00
commit ed46cfdb08
19 changed files with 54 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/formfields/FieldEditor.php
View File

@ -102,7 +102,7 @@ class FieldEditor extends FormField {
$output = new ArrayList();
foreach($fields as $field => $title) {
// get the nice title and strip out field
$niceTitle = trim(eval("return $title::\$singular_name;"));
$niceTitle = Config::inst()->get($title, 'singular_name');
if($niceTitle) {
$output->push(new ArrayData(array(
'ClassName' => $field,

19
code/model/UserDefinedForm.php
View File

@ -74,11 +74,11 @@ class UserDefinedForm extends Page {
$editor->setRows(3);
$label->addExtraClass('left');
UserDefinedForm_EmailRecipient::$summary_fields = array(
UserDefinedForm_EmailRecipient::set_summary_fields(array(
'EmailAddress' => _t('UserDefinedForm.EMAILADDRESS', 'Email'),
'EmailSubject' => _t('UserDefinedForm.EMAILSUBJECT', 'Subject'),
'EmailFrom' => _t('UserDefinedForm.EMAILFROM', 'From')
);
));
// who do we email on submission
$emailRecipients = new GridField("EmailRecipients", _t('UserDefinedForm.EMAILRECIPIENTS', 'Email Recipients'), $this->EmailRecipients(), GridFieldConfig_RecordEditor::create(10));
@ -1016,7 +1016,7 @@ JS
*/
class UserDefinedForm_EmailRecipient extends DataObject {
public static $db = array(
private static $db = array(
'EmailAddress' => 'Varchar(200)',
'EmailSubject' => 'Varchar(200)',
'EmailFrom' => 'Varchar(200)',
@ -1026,12 +1026,23 @@ class UserDefinedForm_EmailRecipient extends DataObject {
'HideFormData' => 'Boolean'
);
public static $has_one = array(
private static $has_one = array(
'Form' => 'UserDefinedForm',
'SendEmailFromField' => 'EditableFormField',
'SendEmailToField' => 'EditableFormField'
);
private static $summary_fields = array();
/**
* Expose the summary_fields static
*
* @param array $fields
*/
public static function set_summary_fields($fields) {
self::$summary_fields = $fields;
}
/**
* @return FieldList
*/

4
code/model/formfields/EditableCheckbox.php
View File

@ -9,9 +9,9 @@
class EditableCheckbox extends EditableFormField {
static $singular_name = 'Checkbox Field';
private static $singular_name = 'Checkbox Field';
static $plural_name = 'Checkboxes';
private static $plural_name = 'Checkboxes';
public function getFieldConfiguration() {
$options = parent::getFieldConfiguration();

4
code/model/formfields/EditableCheckboxGroupField.php
View File

@ -9,9 +9,9 @@
class EditableCheckboxGroupField extends EditableMultipleOptionField {
static $singular_name = "Checkbox Group";
private static $singular_name = "Checkbox Group";
static $plural_name = "Checkbox Groups";
private static $plural_name = "Checkbox Groups";
public function getFormField() {
$optionSet = $this->Options();

4
code/model/formfields/EditableDateField.php
View File

@ -9,9 +9,9 @@
class EditableDateField extends EditableFormField {
static $singular_name = 'Date Field';
private static $singular_name = 'Date Field';
static $plural_name = 'Date Fields';
private static $plural_name = 'Date Fields';
public function getFieldConfiguration() {
$default = ($this->getSetting('DefaultToToday')) ? $this->getSetting('DefaultToToday') : false;

4
code/model/formfields/EditableDropdown.php
View File

@ -9,9 +9,9 @@
class EditableDropdown extends EditableMultipleOptionField {
static $singular_name = 'Dropdown Field';
private static $singular_name = 'Dropdown Field';
static $plural_name = 'Dropdowns';
private static $plural_name = 'Dropdowns';
/**
* @return DropdownField

4
code/model/formfields/EditableEmailField.php
View File

@ -9,9 +9,9 @@
class EditableEmailField extends EditableFormField {
static $singular_name = 'Email Field';
private static $singular_name = 'Email Field';
static $plural_name = 'Email Fields';
private static $plural_name = 'Email Fields';
public function getFormField() {
return new EmailField($this->Name, $this->Title);

4
code/model/formfields/EditableFileField.php
View File

@ -8,9 +8,9 @@
class EditableFileField extends EditableFormField {
public static $singular_name = 'File Upload Field';
private static $singular_name = 'File Upload Field';
public static $plural_names = 'File Fields';
private static $plural_names = 'File Fields';
public function getFormField() {
$field = new FileField($this->Name, $this->Title);

8
code/model/formfields/EditableFormField.php
View File

@ -8,7 +8,7 @@
class EditableFormField extends DataObject {
static $default_sort = "Sort";
private static $default_sort = "Sort";
/**
* A list of CSS classes that can be added
@ -17,7 +17,7 @@ class EditableFormField extends DataObject {
*/
public static $allowed_css = array();
static $db = array(
private static $db = array(
"Name" => "Varchar",
"Title" => "Varchar(255)",
"Default" => "Varchar",
@ -29,11 +29,11 @@ class EditableFormField extends DataObject {
"CustomParameter" => "Varchar(200)"
);
static $has_one = array(
private static $has_one = array(
"Parent" => "UserDefinedForm",
);
static $extensions = array(
private static $extensions = array(
"Versioned('Stage', 'Live')"
);

4
code/model/formfields/EditableFormHeading.php
View File

@ -7,9 +7,9 @@
class EditableFormHeading extends EditableFormField {
static $singular_name = 'Heading';
private static $singular_name = 'Heading';
static $plural_name = 'Headings';
private static $plural_name = 'Headings';
public function getFieldConfiguration() {
$levels = array(

4
code/model/formfields/EditableLiteralField.php
View File

@ -9,9 +9,9 @@
class EditableLiteralField extends EditableFormField {
static $singular_name = 'HTML Block';
private static $singular_name = 'HTML Block';
static $plural_name = 'HTML Blocks';
private static $plural_name = 'HTML Blocks';
public function getFieldConfiguration() {
$customSettings = unserialize($this->CustomSettings);

4
code/model/formfields/EditableMemberListField.php
View File

@ -7,9 +7,9 @@
class EditableMemberListField extends EditableFormField {
static $singular_name = 'Member List Field';
private static $singular_name = 'Member List Field';
static $plural_name = 'Member List Fields';
private static $plural_name = 'Member List Fields';
public function getFieldConfiguration() {
$groupID = ($this->getSetting('GroupID')) ? $this->getSetting('GroupID') : 0;

2
code/model/formfields/EditableMultipleOptionField.php
View File

@ -15,7 +15,7 @@
class EditableMultipleOptionField extends EditableFormField {
static $has_many = array(
private static $has_many = array(
"Options" => "EditableOption"
);

8
code/model/formfields/EditableOption.php
View File

@ -9,20 +9,20 @@
class EditableOption extends DataObject {
static $default_sort = "Sort";
private static $default_sort = "Sort";
static $db = array(
private static $db = array(
"Name" => "Varchar(255)",
"Title" => "Varchar(255)",
"Default" => "Boolean",
"Sort" => "Int"
);
static $has_one = array(
private static $has_one = array(
"Parent" => "EditableMultipleOptionField",
);
static $extensions = array(
private static $extensions = array(
"Versioned('Stage', 'Live')"
);

4
code/model/formfields/EditableRadioField.php
View File

@ -9,9 +9,9 @@
class EditableRadioField extends EditableMultipleOptionField {
static $singular_name = 'Radio field';
private static $singular_name = 'Radio field';
static $plural_name = 'Radio fields';
private static $plural_name = 'Radio fields';
public function getFormField() {
$optionSet = $this->Options();

4
code/model/formfields/EditableTextField.php
View File

@ -9,9 +9,9 @@
class EditableTextField extends EditableFormField {
static $singular_name = 'Text Field';
private static $singular_name = 'Text Field';
static $plural_name = 'Text Fields';
private static $plural_name = 'Text Fields';
public function getFieldConfiguration() {
$fields = parent::getFieldConfiguration();

2
code/model/submissions/SubmittedFileField.php
View File

@ -9,7 +9,7 @@
class SubmittedFileField extends SubmittedFormField {
public static $has_one = array(
private static $has_one = array(
"UploadedFile" => "File"
);

6
code/model/submissions/SubmittedForm.php
View File

@ -7,16 +7,16 @@
class SubmittedForm extends DataObject {
public static $has_one = array(
private static $has_one = array(
"SubmittedBy" => "Member",
"Parent" => "UserDefinedForm",
);
public static $has_many = array(
private static $has_many = array(
"Values" => "SubmittedFormField"
);
public static $summary_fields = array(
private static $summary_fields = array(
'ID',
'Created'
);

6
code/model/submissions/SubmittedFormField.php
View File

@ -7,17 +7,17 @@
class SubmittedFormField extends DataObject {
public static $db = array(
private static $db = array(
"Name" => "Varchar",
"Value" => "Text",
"Title" => "Varchar(255)"
);
public static $has_one = array(
private static $has_one = array(
"Parent" => "SubmittedForm"
);
public static $summary_fields = array(
private static $summary_fields = array(
'Title',
'FormattedValue' => 'Value'
);