From bf9a282355707d0e22a2284bceb73f9aeb89d147 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Thu, 15 Aug 2024 16:23:17 +1200 Subject: [PATCH] ENH Remove unnecessary condition --- src/Actions/NotifyUsersWorkflowAction.php | 2 +- src/Admin/AdvancedWorkflowAdmin.php | 4 +--- src/Extensions/WorkflowApplicable.php | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Actions/NotifyUsersWorkflowAction.php b/src/Actions/NotifyUsersWorkflowAction.php index 584df71e..cdbc7a89 100644 --- a/src/Actions/NotifyUsersWorkflowAction.php +++ b/src/Actions/NotifyUsersWorkflowAction.php @@ -185,7 +185,7 @@ public function getContextFields(DataObject $target) } if ($target instanceof CMSPreviewable) { - $result['CMSLink'] = $target->CMSEditLink(); + $result['CMSLink'] = $target->getCMSEditLink(); } elseif ($target->hasMethod('WorkflowLink')) { $result['CMSLink'] = $target->WorkflowLink(); } diff --git a/src/Admin/AdvancedWorkflowAdmin.php b/src/Admin/AdvancedWorkflowAdmin.php index d24cb41b..9f027b61 100644 --- a/src/Admin/AdvancedWorkflowAdmin.php +++ b/src/Admin/AdvancedWorkflowAdmin.php @@ -286,9 +286,7 @@ public function userObjects(Member $user, $fieldName) // Title property.. $instance->setField('Title', $target->getField('Title')); $instance->setField('LastEdited', $target->getField('LastEdited')); - if (method_exists($target, 'CMSEditLink')) { - $instance->setField('ObjectRecordLink', $target->CMSEditLink()); - } + $instance->setField('ObjectRecordLink', $target->getCMSEditLink()); $list->push($instance); } diff --git a/src/Extensions/WorkflowApplicable.php b/src/Extensions/WorkflowApplicable.php index 9e4f1c0b..284682b9 100644 --- a/src/Extensions/WorkflowApplicable.php +++ b/src/Extensions/WorkflowApplicable.php @@ -304,7 +304,7 @@ public function AbsoluteEditLink() $CMSEditLink = null; if ($this->owner instanceof CMSPreviewable) { - $CMSEditLink = $this->owner->CMSEditLink(); + $CMSEditLink = $this->owner->getCMSEditLink(); } elseif ($this->owner->hasMethod('WorkflowLink')) { $CMSEditLink = $this->owner->WorkflowLink(); }