Compare commits
1 commit
4308368c91
...
930c039c5d
| Author | SHA1 | Date | |
|---|---|---|---|
| 930c039c5d |
1 changed files with 5 additions and 9 deletions
|
|
@ -197,8 +197,7 @@ defmodule MvWeb.MemberExportController do
|
|||
parsed
|
||||
|> ensure_sort_custom_field_loaded()
|
||||
|
||||
with {:ok, custom_fields_by_id} <-
|
||||
load_custom_fields_by_id(parsed.custom_field_ids_union, actor),
|
||||
with {:ok, custom_fields_by_id} <- load_custom_fields_by_id(parsed.custom_field_ids_union, actor),
|
||||
{:ok, members} <- load_members_for_export(actor, parsed, custom_fields_by_id) do
|
||||
columns = build_columns(conn, parsed, custom_fields_by_id)
|
||||
csv_iodata = MembersCSV.export(members, columns)
|
||||
|
|
@ -216,17 +215,14 @@ defmodule MvWeb.MemberExportController do
|
|||
end
|
||||
end
|
||||
|
||||
defp ensure_sort_custom_field_loaded(
|
||||
%{custom_field_ids: ids, custom_field_ids_union: union, sort_field: sort_field} = parsed
|
||||
) do
|
||||
defp ensure_sort_custom_field_loaded(%{custom_field_ids: ids, custom_field_ids_union: union, sort_field: sort_field} = parsed) do
|
||||
case extract_sort_custom_field_id(sort_field) do
|
||||
nil ->
|
||||
parsed
|
||||
|
||||
id ->
|
||||
%{
|
||||
parsed
|
||||
| custom_field_ids: Enum.uniq([id | ids]),
|
||||
%{parsed |
|
||||
custom_field_ids: Enum.uniq([id | ids]),
|
||||
custom_field_ids_union: Enum.uniq([id | union])
|
||||
}
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue