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

Merge pull request #716 from creative-commoners/pulls/5.0/fix_permissions_on_email_recipient

Browse Source 
fall back to CMSMain rather than LeftAndMain to getFormParent correctly
This commit is contained in:
Dylan Wagstaff 2018-02-14 09:55:43 +13:00 committed by GitHub
commit 516452bb14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,7 @@ class EmailRecipient extends DataObject
]; ];
private static $has_one = [ private static $has_one = [
'Form' => DataObject::class, 'Form' => UserDefinedForm::class,
'SendEmailFromField' => EditableFormField::class, 'SendEmailFromField' => EditableFormField::class,
'SendEmailToField' => EditableFormField::class, 'SendEmailToField' => EditableFormField::class,
'SendEmailSubjectField' => EditableFormField::class 'SendEmailSubjectField' => EditableFormField::class
@ -125,12 +125,12 @@ class EmailRecipient extends DataObject
/** /**
* Get instance of UserDefinedForm when editing in getCMSFields * Get instance of UserDefinedForm when editing in getCMSFields
* *
* @return UserDefinedFrom * @return UserDefinedForm
*/ */
protected function getFormParent() protected function getFormParent()
{ {
// LeftAndMain::sessionNamespace is protected. @todo replace this with a non-deprecated equivalent. // LeftAndMain::sessionNamespace is protected. @todo replace this with a non-deprecated equivalent.
$sessionNamespace = $this->config()->get('session_namespace') ?: LeftAndMain::class; $sessionNamespace = $this->config()->get('session_namespace') ?: CMSMain::class;
$formID = $this->FormID $formID = $this->FormID
? $this->FormID ? $this->FormID
@ -448,16 +448,15 @@ class EmailRecipient extends DataObject
public function canView($member = null) public function canView($member = null)
{ {
if ($form = $this->Form()) { if ($form = $this->getFormParent()) {
return $form->canView($member); return $form->canView($member);
} }
return parent::canView($member); return parent::canView($member);
} }
public function canEdit($member = null) public function canEdit($member = null)
{ {
if ($form = $this->Form()) { if ($form = $this->getFormParent()) {
return $form->canEdit($member); return $form->canEdit($member);
} }