ash-project/ash
1
0
Fork 0
mirror of https://github.com/ash-project/ash.git synced 2024-09-17 03:53:02 +12:00
Code Issues Projects Releases Packages Wiki Activity

fix: honor return_destroyed? in soft destroy actions

Browse source 
fixes #1433
This commit is contained in:
Zach Daniel 2024-09-02 14:16:12 -04:00
parent 1002d8178e
commit abef09148e
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ash/actions/update/update.ex
View file

@ -284,7 +284,8 @@ defmodule Ash.Actions.Update do
changeset.action,
changeset,
instructions,
opts[:return_notifications?]
opts[:return_notifications?],
opts[:return_destroyed?]
)
end
|> case do
@ -351,10 +352,11 @@ defmodule Ash.Actions.Update do
action,
changeset,
instructions,
return_notifications?
return_notifications?,
return_destroyed?
) do
if return_notifications? do
if changeset.action_type == :destroy do
if changeset.action_type == :destroy && !return_destroyed? do
{:ok, Map.get(instructions, :notifications, [])}
else
{:ok, result, Map.get(instructions, :notifications, [])}
@ -362,7 +364,7 @@ defmodule Ash.Actions.Update do
else
Helpers.warn_missed!(resource, action, instructions)
if changeset.action_type == :destroy do
if changeset.action_type == :destroy && !return_destroyed? do
:ok
else
{:ok, result}