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 #678 from creative-commoners/pulls/5.0/upgrated-carrots

Browse Source 
FIX Remove incorrect upgrader translation operations and mark to be skipped in future
This commit is contained in:
Daniel Hensby 2017-10-25 22:22:26 +01:00 committed by GitHub
commit b5be6f02d2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/Model/EditableFormField/EditableMemberListField.php
View File

@ -34,11 +34,12 @@ class EditableMemberListField extends EditableFormField
$fields->removeByName('Default');
$fields->removeByName('Validation');
/** @skipUpgrade */
$fields->addFieldToTab(
'Root.Main',
DropdownField::create(
'GroupID',
_t('SilverStripe\\UserForms\\Model\\EditableFormField.GROUP', Group::class),
_t('SilverStripe\\UserForms\\Model\\EditableFormField.GROUP', 'Group'),
Group::get()->map()
)->setEmptyString(' ')
);

3
code/Model/Recipient/EmailRecipient.php
View File

@ -109,7 +109,8 @@ class EmailRecipient extends DataObject
{
$fields = parent::summaryFields();
if (isset($fields['EmailAddress'])) {
$fields['EmailAddress'] = _t('SilverStripe\\UserForms\\Model\\UserDefinedForm.EMAILADDRESS', Email::class);
/** @skipUpgrade */
$fields['EmailAddress'] = _t('SilverStripe\\UserForms\\Model\\UserDefinedForm.EMAILADDRESS', 'Email');
}
if (isset($fields['EmailSubject'])) {
$fields['EmailSubject'] = _t('SilverStripe\\UserForms\\Model\\UserDefinedForm.EMAILSUBJECT', 'Subject');