-
Notifications
You must be signed in to change notification settings - Fork 823
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
FIX: UnsavedRelationList first/last to return null if list is empty (fixes #11083) #11085
FIX: UnsavedRelationList first/last to return null if list is empty (fixes #11083) #11085
Conversation
if (is_numeric($item)) { | ||
$item = DataObject::get_by_id($this->dataClass, $item); | ||
} | ||
if (!empty($this->extraFields[key($this->items)])) { | ||
if ($item && !empty($this->extraFields[key($this->items)])) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not actually part of this fix but seemed like sensible defensive coding. Happy to remove or break out into a separate commit if preferred
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems sensible.
if (!empty($this->extraFields[key($this->items)])) { | ||
$item = end($this->items) ?: null; | ||
if (is_numeric($item)) { | ||
$item = DataObject::get_by_id($this->dataClass, $item); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pushed a second commit for this bugfix. tldr; UnsavedRelationList
items array can contain both full objects (for unsaved records) or just IDs (for already existing records). This code already exists in first()
, I think last()
was just overlooked.
Covered by the test already added for the main fix (that’s how I noticed this!): https://github.com/silverstripe/silverstripe-framework/actions/runs/7085966036/job/19283271493?pr=11085
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Issue #11083