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 debd1d4499 into 574ca14ee7

Browse Source
This commit is contained in:
Guy Sartorelli 2024-10-22 02:41:26 +00:00 committed by GitHub
commit 6096c98b6a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/Model/EditableCustomRule.php
View File

@ -119,7 +119,7 @@ class EditableCustomRule extends DataObject
} }
// Hack in currently edited page if context is missing // Hack in currently edited page if context is missing
if (Controller::has_curr() && Controller::curr() instanceof CMSMain) { if (Controller::has_curr() && Controller::curr() instanceof CMSMain) {
return Controller::curr()->currentPage(); return Controller::curr()->currentRecord();
} }
// No page being edited // No page being edited

4
code/Model/EditableFormField.php
View File

@ -509,7 +509,7 @@ class EditableFormField extends DataObject
// This is to restore User Forms 2.x backwards compatibility. // This is to restore User Forms 2.x backwards compatibility.
$controller = Controller::curr(); $controller = Controller::curr();
if ($controller && $controller instanceof CMSPageEditController) { if ($controller && $controller instanceof CMSPageEditController) {
$parent = $controller->getRecord($controller->currentPageID()); $parent = $controller->getRecord($controller->currentRecordID());
// Only allow this behaviour on pages using UserFormFieldEditorExtension, such // Only allow this behaviour on pages using UserFormFieldEditorExtension, such
// as UserDefinedForm page type. // as UserDefinedForm page type.
if ($parent && $parent->hasExtension(UserFormFieldEditorExtension::class)) { if ($parent && $parent->hasExtension(UserFormFieldEditorExtension::class)) {
@ -572,7 +572,7 @@ class EditableFormField extends DataObject
} }
// Hack in currently edited page if context is missing // Hack in currently edited page if context is missing
if (Controller::has_curr() && Controller::curr() instanceof CMSMain) { if (Controller::has_curr() && Controller::curr() instanceof CMSMain) {
return Controller::curr()->currentPage(); return Controller::curr()->currentRecord();
} }
// No page being edited // No page being edited

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

@ -228,7 +228,7 @@ class EmailRecipient extends DataObject
// LeftAndMain::sessionNamespace is protected. // LeftAndMain::sessionNamespace is protected.
$sessionNamespace = $this->config()->get('session_namespace') ?: CMSMain::class; $sessionNamespace = $this->config()->get('session_namespace') ?: CMSMain::class;
$formID = Controller::curr()->getRequest()->getSession()->get($sessionNamespace . '.currentPage'); $formID = Controller::curr()->getRequest()->getSession()->get($sessionNamespace . '.currentRecord');
if ($formID) { if ($formID) {
return UserDefinedForm::get()->byID($formID); return UserDefinedForm::get()->byID($formID);
} }
@ -460,7 +460,7 @@ class EmailRecipient extends DataObject
} }
// Hack in currently edited page if context is missing // Hack in currently edited page if context is missing
if (Controller::has_curr() && Controller::curr() instanceof CMSMain) { if (Controller::has_curr() && Controller::curr() instanceof CMSMain) {
return Controller::curr()->currentPage(); return Controller::curr()->currentRecord();
} }
// No page being edited // No page being edited

2
code/Model/Recipient/EmailRecipientCondition.php
View File

@ -143,7 +143,7 @@ class EmailRecipientCondition extends DataObject
} }
// Hack in currently edited page if context is missing // Hack in currently edited page if context is missing
if (Controller::has_curr() && Controller::curr() instanceof CMSMain) { if (Controller::has_curr() && Controller::curr() instanceof CMSMain) {
return Controller::curr()->currentPage(); return Controller::curr()->currentRecord();
} }
// No page being edited // No page being edited

2
code/Model/UserDefinedForm.php
View File

@ -19,7 +19,7 @@ class UserDefinedForm extends Page
/** /**
* @var string * @var string
*/ */
private static $icon_class = 'font-icon-p-list'; private static $cms_icon_class = 'font-icon-p-list';
/** /**
* @var string * @var string